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

feat: Add action confirm on Workflow

Browse source 
imp: move Action Confirmation into transitions level
This commit is contained in:
theerayut 2025-07-23 22:10:44 +07:00
parent aca2801897
commit 85a5f05b80
4 changed files with 42 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
frappe/public/js/frappe/form/workflow.js
View file

@ -102,25 +102,14 @@ 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 () {
// set the workflow_action for use in form scripts
frappe.dom.freeze();
me.frm.selected_workflow_action = d.action;
me.frm.script_manager.trigger("before_workflow_action").then(() => {
frappe
.xcall("frappe.model.workflow.apply_workflow", {
doc: me.frm.doc,
action: d.action,
})
.then((doc) => {
frappe.model.sync(doc);
me.frm.refresh();
me.frm.selected_workflow_action = null;
me.frm.script_manager.trigger("after_workflow_action");
})
.finally(() => {
frappe.dom.unfreeze();
});
});
if (d.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);
}
});
}
});
@ -129,6 +118,29 @@ frappe.ui.form.States = class FormStates {
});
}
handle_workflow_action(transition) {
var me = this;
// set the workflow_action for use in form scripts
frappe.dom.freeze();
me.frm.selected_workflow_action = transition.action;
me.frm.script_manager.trigger("before_workflow_action").then(() => {
frappe
.xcall("frappe.model.workflow.apply_workflow", {
doc: me.frm.doc,
action: transition.action,
})
.then((doc) => {
frappe.model.sync(doc);
me.frm.refresh();
me.frm.selected_workflow_action = null;
me.frm.script_manager.trigger("after_workflow_action");
})
.finally(() => {
frappe.dom.unfreeze();
});
});
}
setup_btn(action_added) {
if (action_added) {
this.frm.page.btn_primary.addClass("hide");

2
frappe/public/js/workflow_builder/components/Properties.vue
View file

@ -18,7 +18,7 @@ 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", "condition"].includes(df.fieldname)
["action", "allowed", "allow_self_approval", "action_confirm", "condition"].includes(df.fieldname)
);
} else if (store.workflow.selected && "state" in store.workflow.selected.data) {
title.value = __("State Properties");

2
frappe/workflow/doctype/workflow/workflow.json
View file

@ -126,4 +126,4 @@
"sort_order": "DESC",
"states": [],
"track_changes": 1
}
}

10
frappe/workflow/doctype/workflow_transition/workflow_transition.json
View file

@ -12,6 +12,7 @@
"allowed",
"allow_self_approval",
"send_email_to_creator",
"enable_action_confirmation",
"conditions",
"condition",
"column_break_7",
@ -99,7 +100,14 @@
"fieldname": "send_email_to_creator",
"fieldtype": "Check",
"label": "Send Email To Creator"
}
},
{
"default": "0",
"description": "If checked, action confirmation will be required before performing workflow actions",
"fieldname": "enable_action_confirmation",
"fieldtype": "Check",
"label": "Enable Action Confirmation"
}
],
"idx": 1,
"istable": 1,