diff --git a/frappe/public/js/frappe/form/workflow.js b/frappe/public/js/frappe/form/workflow.js index 0d2d83886c..72e50feb0a 100644 --- a/frappe/public/js/frappe/form/workflow.js +++ b/frappe/public/js/frappe/form/workflow.js @@ -102,13 +102,22 @@ frappe.ui.form.States = class FormStates { if (frappe.user_roles.includes(d.allowed) && has_approval_access(d)) { added = true; me.frm.page.add_action_item(__(d.action), function () { - if (d.enable_action_confirmation || me.frm.enable_action_confirmation) { - frappe.confirm(__("Are you sure you want to {0}?", [d.action]), () => - me.handle_workflow_action(d) - ); - } else { - me.handle_workflow_action(d); - } + frappe.db + .get_value( + "Workflow", + { document_type: me.frm.doctype }, + "enable_action_confirmation" + ) + .then((r) => { + if (r.message.enable_action_confirmation) { + frappe.confirm( + __("Are you sure you want to {0}?", [d.action]), + () => me.handle_workflow_action(d) + ); + } else { + me.handle_workflow_action(d); + } + }); }); } }); diff --git a/frappe/public/js/workflow_builder/components/Properties.vue b/frappe/public/js/workflow_builder/components/Properties.vue index 79402deacb..12b3f4371e 100644 --- a/frappe/public/js/workflow_builder/components/Properties.vue +++ b/frappe/public/js/workflow_builder/components/Properties.vue @@ -18,14 +18,9 @@ let properties = computed(() => { if (store.workflow.selected && "action" in store.workflow.selected.data) { title.value = __("Transition Properties"); return store.transitionfields.filter((df) => - [ - "action", - "allowed", - "allow_self_approval", - "enable_action_confirmation", - "condition", - "transition_tasks", - ].includes(df.fieldname) + ["action", "allowed", "allow_self_approval", "condition", "transition_tasks"].includes( + df.fieldname + ) ); } else if (store.workflow.selected && "state" in store.workflow.selected.data) { title.value = __("State Properties"); diff --git a/frappe/workflow/doctype/workflow_transition/workflow_transition.json b/frappe/workflow/doctype/workflow_transition/workflow_transition.json index 3e2edba5ad..c169596c95 100644 --- a/frappe/workflow/doctype/workflow_transition/workflow_transition.json +++ b/frappe/workflow/doctype/workflow_transition/workflow_transition.json @@ -12,7 +12,6 @@ "allowed", "allow_self_approval", "send_email_to_creator", - "enable_action_confirmation", "transition_tasks", "conditions", "condition", @@ -103,17 +102,10 @@ "label": "Send Email To Creator" }, { - "default": "0", - "description": "If checked, a confirmation will be required before performing workflow actions.", - "fieldname": "enable_action_confirmation", - "fieldtype": "Check", - "label": "Enable Action Confirmation" - }, - { - "fieldname": "transition_tasks", - "fieldtype": "Link", - "label": "Transition Tasks", - "options": "Workflow Transition Tasks" + "fieldname": "transition_tasks", + "fieldtype": "Link", + "label": "Transition Tasks", + "options": "Workflow Transition Tasks" } ], "idx": 1,