From 8cb188834ab15bd6115b3e7404e633d8ddbe5c6f Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 4 Nov 2020 14:42:38 +0530 Subject: [PATCH 1/4] refactor: explicitly enable and disable report (cherry picked from commit d012d9145cad2d889e3bcdfe5783a722fa7f6d78) --- frappe/core/doctype/report/report.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/core/doctype/report/report.js b/frappe/core/doctype/report/report.js index 14e9b3a901c0..f78fd3e81233 100644 --- a/frappe/core/doctype/report/report.js +++ b/frappe/core/doctype/report/report.js @@ -2,7 +2,9 @@ frappe.ui.form.on('Report', { refresh: function(frm) { if (frm.doc.is_standard === "Yes" && !frappe.boot.developer_mode) { // make the document read-only - frm.set_read_only(); + frm.disable_form(); + } else { + frm.enable_save(); } let doc = frm.doc; @@ -32,8 +34,6 @@ frappe.ui.form.on('Report', { }); }, doc.disabled ? "fa fa-check" : "fa fa-off"); } - - frm.events.report_type(frm); }, ref_doctype: function(frm) { From 9f1154dc10f03813eadad03992f34fffe68b0d60 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 4 Nov 2020 15:03:52 +0530 Subject: [PATCH 2/4] fix: toggle enable on refresh Moving between a read-only and non-read-only doc, the form save status would not be updated, this commit fixes it (cherry picked from commit b3bcc9f1bfa8d37f98efabb26d24dd39eba94144) --- frappe/public/js/frappe/form/form.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index 1c1c7b1f01f3..8e41e096fbba 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -275,6 +275,10 @@ frappe.ui.form.Form = class FrappeForm { this.read_only = frappe.workflow.is_read_only(this.doctype, this.docname); if (this.read_only) this.set_read_only(true); + if (this.save_disabled && !this.read_only) { + this.enable_save() + } + // check if doctype is already open if (!this.opendocs[this.docname]) { this.check_doctype_conflict(this.docname); From e7c8dd60825fa4e074b3f638fd1575aad643cc5b Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 4 Nov 2020 15:19:09 +0530 Subject: [PATCH 3/4] style: add semi (cherry picked from commit a4462a83d5fb8cba68897d11d7f18990617558fc) --- frappe/public/js/frappe/form/form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index 8e41e096fbba..904ab2e1b7fb 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -276,7 +276,7 @@ frappe.ui.form.Form = class FrappeForm { if (this.read_only) this.set_read_only(true); if (this.save_disabled && !this.read_only) { - this.enable_save() + this.enable_save(); } // check if doctype is already open From b72f4ee1c25d26fc90203be5065be07763c4e48d Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 4 Nov 2020 15:45:06 +0530 Subject: [PATCH 4/4] refactor: update disable_save variable instead of calling this.enable_save (cherry picked from commit 505f4afc6a5c1ede0451bc72026431d7263cd389) --- frappe/public/js/frappe/form/form.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index 904ab2e1b7fb..bb9e8c22d136 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -261,7 +261,7 @@ frappe.ui.form.Form = class FrappeForm { cur_frm = this; if(this.docname) { // document to show - + this.save_disabled = false; // set the doc this.doc = frappe.get_doc(this.doctype, this.docname); @@ -275,10 +275,6 @@ frappe.ui.form.Form = class FrappeForm { this.read_only = frappe.workflow.is_read_only(this.doctype, this.docname); if (this.read_only) this.set_read_only(true); - if (this.save_disabled && !this.read_only) { - this.enable_save(); - } - // check if doctype is already open if (!this.opendocs[this.docname]) { this.check_doctype_conflict(this.docname);