From 84241e5b612fa160fe014e9f6c4d7b00742c47b9 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 17 Feb 2020 14:06:06 +0530
Subject: [PATCH 1/4] feat: better only_for role message

---
 frappe/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 12e5204001..e44ecb3420 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -544,7 +544,7 @@ def only_for(roles, message=False):
 	myroles = set(get_roles())
 	if not roles.intersection(myroles):
 		if message:
-			msgprint(_('Only for {}').format(', '.join(roles)))
+			msgprint(_('This action is only allowed for {}').format(bold(', '.join(roles))), _('Not Permitted'))
 		raise PermissionError
 
 def get_domain_data(module):

From 290d077572daae055f419eaedb55cf81d3922d39 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 17 Feb 2020 14:07:18 +0530
Subject: [PATCH 2/4] feat: add save button only for script manager

- Save option will only be shown to script manager.
- The report name field is set to mandatory
---
 .../js/frappe/views/reports/query_report.js   | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index 365cbaa9db..cac03213d4 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -1022,7 +1022,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 	}
 
 	get_menu_items() {
-		return [
+		let items = [
 			{
 				label: __('Refresh'),
 				action: () => this.refresh(),
@@ -1153,6 +1153,18 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 				standard: true
 			},
 			{
+				label: __('User Permissions'),
+				action: () => frappe.set_route('List', 'User Permission', {
+					doctype: 'Report',
+					name: this.report_name
+				}),
+				condition: () => frappe.model.can_set_user_permissions('Report'),
+				standard: true
+			}
+		];
+
+		if(frappe.user.is_report_manager()) {
+			items.push({
 				label: __('Save'),
 				action: () => {
 					let d = new frappe.ui.Dialog({
@@ -1163,6 +1175,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 								fieldname: 'report_name',
 								label: __("Report Name"),
 								default: this.report_doc.is_standard == 'No' ? this.report_name : "",
+								reqd: true
 							}
 						],
 						primary_action: (values) => {
@@ -1184,17 +1197,10 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 					d.show();
 				},
 				standard: true
-			},
-			{
-				label: __('User Permissions'),
-				action: () => frappe.set_route('List', 'User Permission', {
-					doctype: 'Report',
-					name: this.report_name
-				}),
-				condition: () => frappe.model.can_set_user_permissions('Report'),
-				standard: true
-			}
-		];
+			})
+		}
+
+		return items
 	}
 
 	add_portrait_warning(dialog) {

From 00901422321dc4dd3ee2d1c59e7971c7a7546e88 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Tue, 18 Feb 2020 11:38:47 +0530
Subject: [PATCH 3/4] style: fix formatting

---
 frappe/public/js/frappe/views/reports/query_report.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index cac03213d4..e356a7945b 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -1163,7 +1163,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 			}
 		];
 
-		if(frappe.user.is_report_manager()) {
+		if (frappe.user.is_report_manager()) {
 			items.push({
 				label: __('Save'),
 				action: () => {

From 8c7a7942dc66df4f04006f4f2b56a85caf76a09f Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchampfaris@users.noreply.github.com>
Date: Tue, 18 Feb 2020 12:20:52 +0530
Subject: [PATCH 4/4] style: missing semicolon

---
 frappe/public/js/frappe/views/reports/query_report.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index e356a7945b..22ae5d50c1 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -1200,7 +1200,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 			})
 		}
 
-		return items
+		return items;
 	}
 
 	add_portrait_warning(dialog) {