vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #36995 from frappe/34570-bug-workflow-action---expired-link---wrong-information-displayed

Browse source
This commit is contained in:
Suraj Shetty 2026-02-25 17:14:49 +05:30 • committed by GitHub
commit 947b63d4f2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 45 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
frappe/workflow/doctype/workflow_action/workflow_action.py
View file

@ -207,17 +207,61 @@ def return_action_confirmation_page(doc, action, action_link, alert_doc_change=F
def return_link_expired_page(doc, doc_workflow_state):
user_full_name = get_user_who_set_workflow_state(doc, doc_workflow_state) or frappe.get_value(
"User", doc.get("modified_by"), "full_name"
)
frappe.respond_as_web_page(
_("Link Expired"),
_("Document {0} has been set to state {1} by {2}").format(
frappe.bold(doc.get("name")),
frappe.bold(doc_workflow_state),
frappe.bold(frappe.get_value("User", doc.get("modified_by"), "full_name")),
frappe.bold(
user_full_name
if user_full_name
else frappe.get_value("User", doc.get("modified_by"), "full_name")
),
),
indicator_color="blue",
)
def get_user_who_set_workflow_state(doc, doc_workflow_state):
"""Get the full name of the user who triggered the workflow action that set the document to the given state.
Falls back to None if no completed Workflow Action is found (e.g. state was set without workflow).
"""
workflow_name = get_workflow_name(doc.get("doctype"))
if not workflow_name:
return None
# Get states that have a transition to the current workflow state
from_states = frappe.get_all(
"Workflow Transition",
filters={"parent": workflow_name, "next_state": doc_workflow_state},
pluck="state",
)
if not from_states:
return None
# Find the most recently completed Workflow Action that led to this state
WorkflowAction = DocType("Workflow Action")
completed_by = (
frappe.qb.from_(WorkflowAction)
.select(WorkflowAction.completed_by)
.where(
(WorkflowAction.reference_doctype == doc.get("doctype"))
& (WorkflowAction.reference_name == doc.get("name"))
& (WorkflowAction.status == "Completed")
& (WorkflowAction.workflow_state.isin(from_states))
)
.orderby(WorkflowAction.modified, order=frappe.qb.desc)
.limit(1)
).run()
if completed_by and completed_by[0][0]:
return frappe.get_value("User", completed_by[0][0], "full_name")
return None
def update_completed_workflow_actions(doc, user=None, workflow=None, workflow_state=None):
allowed_roles = get_allowed_roles(user, workflow, workflow_state)
# There is no transaction leading upto this state