From 9a23312ad7ca3de2d4db78c5bccd67cd1a7bef1c Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Tue, 12 Nov 2019 13:37:51 +0530 Subject: [PATCH 1/3] fix(Report): validate 'Script Manager' role only for report type 'Script Report' --- frappe/core/doctype/report/report.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/doctype/report/report.py b/frappe/core/doctype/report/report.py index f71179d388..e88a2d3335 100644 --- a/frappe/core/doctype/report/report.py +++ b/frappe/core/doctype/report/report.py @@ -30,7 +30,7 @@ class Report(Document): if self.is_standard == "No": # allow only script manager to edit scripts - if frappe.session.user!="Administrator": + if self.report_type == 'Script Report' and frappe.conf.server_script_enabled and frappe.session.user != "Administrator": frappe.only_for('Script Manager', True) if frappe.db.get_value("Report", self.name, "is_standard") == "Yes": From 6797aec45b03cc8c98510b884291505f8cc61e55 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Wed, 20 Nov 2019 19:52:08 +0530 Subject: [PATCH 2/3] fix: do not validate Script Manager role for Report Builder type --- frappe/core/doctype/report/report.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/doctype/report/report.py b/frappe/core/doctype/report/report.py index e88a2d3335..ff2620a087 100644 --- a/frappe/core/doctype/report/report.py +++ b/frappe/core/doctype/report/report.py @@ -30,7 +30,7 @@ class Report(Document): if self.is_standard == "No": # allow only script manager to edit scripts - if self.report_type == 'Script Report' and frappe.conf.server_script_enabled and frappe.session.user != "Administrator": + if self.report_type != 'Report Builder' and frappe.session.user != "Administrator": frappe.only_for('Script Manager', True) if frappe.db.get_value("Report", self.name, "is_standard") == "Yes": From 6a489f1e395aadf00077a16c9a32713a4a183f00 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Thu, 21 Nov 2019 14:43:53 +0530 Subject: [PATCH 3/3] fix: remove explicit check for session user as Administrator Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> --- frappe/core/doctype/report/report.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/doctype/report/report.py b/frappe/core/doctype/report/report.py index ff2620a087..099c279dab 100644 --- a/frappe/core/doctype/report/report.py +++ b/frappe/core/doctype/report/report.py @@ -30,7 +30,7 @@ class Report(Document): if self.is_standard == "No": # allow only script manager to edit scripts - if self.report_type != 'Report Builder' and frappe.session.user != "Administrator": + if self.report_type != 'Report Builder': frappe.only_for('Script Manager', True) if frappe.db.get_value("Report", self.name, "is_standard") == "Yes":