From 14abb0e861ed3f8e7cb7570d7fd49ecef365db90 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 28 Feb 2023 12:34:17 +0530 Subject: [PATCH] fix(workflow): move dom unfreeze to `finally` (backport #20161) (#20176) * fix(workflow): move dom unfreeze to `finally` (#20161) * fix(workflow): move dom unfreeze to `finally` * fix: keep only unfreeze in `finally` (cherry picked from commit d8ca42115917f16287fa528a74fb59ca6e5edbeb) # Conflicts: # frappe/public/js/frappe/form/workflow.js * chore: conflicts --------- Co-authored-by: Dany Robert Co-authored-by: Ankush Menat --- frappe/public/js/frappe/form/workflow.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/workflow.js b/frappe/public/js/frappe/form/workflow.js index 80348fb706f..2915702359a 100644 --- a/frappe/public/js/frappe/form/workflow.js +++ b/frappe/public/js/frappe/form/workflow.js @@ -95,11 +95,13 @@ frappe.ui.form.States = Class.extend({ frappe.xcall('frappe.model.workflow.apply_workflow', {doc: me.frm.doc, action: d.action}) .then((doc) => { - frappe.dom.unfreeze(); 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(); }); }); });