From b63f4400f4d957bff7a802d0b0aee5d3166db0ba Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Fri, 24 Feb 2017 20:22:21 +0530 Subject: [PATCH] added roles in the report --- .../document_share_report.json | 11 +++++++--- .../feedback_ratings/feedback_ratings.json | 11 +++++++--- .../permitted_documents_for_user.json | 12 +++++++++-- frappe/core/report/todo/todo.js | 8 ++++++++ frappe/core/report/todo/todo.json | 13 +++++++++--- .../addresses_and_contacts.json | 20 ++++++++++++++++--- frappe/modules/import_file.py | 2 +- .../v7_3/set_ref_doctype_roles_to_report.py | 2 +- 8 files changed, 63 insertions(+), 16 deletions(-) create mode 100644 frappe/core/report/todo/todo.js diff --git a/frappe/core/report/document_share_report/document_share_report.json b/frappe/core/report/document_share_report/document_share_report.json index d41514cba0..db2f2b6be8 100644 --- a/frappe/core/report/document_share_report/document_share_report.json +++ b/frappe/core/report/document_share_report/document_share_report.json @@ -5,15 +5,20 @@ "disabled": 0, "docstatus": 0, "doctype": "Report", - "idx": 0, + "idx": 2, "is_standard": "Yes", "json": "{\"add_total_row\": 0, \"sort_by\": \"DocShare.modified\", \"sort_order\": \"desc\", \"sort_by_next\": null, \"filters\": [], \"sort_order_next\": \"desc\", \"columns\": [[\"name\", \"DocShare\"], [\"user\", \"DocShare\"], [\"share_doctype\", \"DocShare\"], [\"share_name\", \"DocShare\"], [\"read\", \"DocShare\"], [\"write\", \"DocShare\"], [\"share\", \"DocShare\"]]}", - "modified": "2016-12-05 18:49:38.059352", + "modified": "2017-02-24 20:01:16.232286", "modified_by": "Administrator", "module": "Core", "name": "Document Share Report", "owner": "Administrator", "ref_doctype": "DocShare", "report_name": "Document Share Report", - "report_type": "Report Builder" + "report_type": "Report Builder", + "roles": [ + { + "role": "System Manager" + } + ] } \ No newline at end of file diff --git a/frappe/core/report/feedback_ratings/feedback_ratings.json b/frappe/core/report/feedback_ratings/feedback_ratings.json index 2383253a28..48c10c2e6c 100644 --- a/frappe/core/report/feedback_ratings/feedback_ratings.json +++ b/frappe/core/report/feedback_ratings/feedback_ratings.json @@ -5,14 +5,19 @@ "disabled": 0, "docstatus": 0, "doctype": "Report", - "idx": 0, + "idx": 2, "is_standard": "Yes", - "modified": "2017-02-07 12:36:50.992811", + "modified": "2017-02-24 19:56:51.141147", "modified_by": "Administrator", "module": "Core", "name": "Feedback Ratings", "owner": "Administrator", "ref_doctype": "Feedback Trigger", "report_name": "Feedback Ratings", - "report_type": "Script Report" + "report_type": "Script Report", + "roles": [ + { + "role": "System Manager" + } + ] } \ No newline at end of file diff --git a/frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.json b/frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.json index 458baa936c..68b866a531 100644 --- a/frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.json +++ b/frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.json @@ -1,15 +1,23 @@ { + "add_total_row": 0, "apply_user_permissions": 1, "creation": "2014-06-03 05:20:35.218263", + "disabled": 0, "docstatus": 0, "doctype": "Report", + "idx": 3, "is_standard": "Yes", - "modified": "2014-06-03 07:18:17.218526", + "modified": "2017-02-24 20:16:34.069990", "modified_by": "Administrator", "module": "Core", "name": "Permitted Documents For User", "owner": "Administrator", "ref_doctype": "User", "report_name": "Permitted Documents For User", - "report_type": "Script Report" + "report_type": "Script Report", + "roles": [ + { + "role": "System Manager" + } + ] } \ No newline at end of file diff --git a/frappe/core/report/todo/todo.js b/frappe/core/report/todo/todo.js new file mode 100644 index 0000000000..805991cc40 --- /dev/null +++ b/frappe/core/report/todo/todo.js @@ -0,0 +1,8 @@ +// Copyright (c) 2016, Frappe Technologies and contributors +// For license information, please see license.txt + +frappe.query_reports["ToDo"] = { + "filters": [ + + ] +} diff --git a/frappe/core/report/todo/todo.json b/frappe/core/report/todo/todo.json index f808571789..18ff072c23 100644 --- a/frappe/core/report/todo/todo.json +++ b/frappe/core/report/todo/todo.json @@ -1,16 +1,23 @@ { + "add_total_row": 0, "apply_user_permissions": 1, "creation": "2013-02-25 14:26:30", + "disabled": 0, "docstatus": 0, "doctype": "Report", - "idx": 1, + "idx": 3, "is_standard": "Yes", - "modified": "2014-06-03 07:18:17.374222", + "modified": "2017-02-24 20:13:12.217943", "modified_by": "Administrator", "module": "Core", "name": "ToDo", "owner": "Administrator", "ref_doctype": "ToDo", "report_name": "ToDo", - "report_type": "Script Report" + "report_type": "Script Report", + "roles": [ + { + "role": "System Manager" + } + ] } \ No newline at end of file diff --git a/frappe/geo/report/addresses_and_contacts/addresses_and_contacts.json b/frappe/geo/report/addresses_and_contacts/addresses_and_contacts.json index f229d15e7e..f21db17886 100644 --- a/frappe/geo/report/addresses_and_contacts/addresses_and_contacts.json +++ b/frappe/geo/report/addresses_and_contacts/addresses_and_contacts.json @@ -5,14 +5,28 @@ "disabled": 0, "docstatus": 0, "doctype": "Report", - "idx": 0, + "idx": 2, "is_standard": "Yes", - "modified": "2017-01-19 12:57:39.643565", + "modified": "2017-02-24 19:57:37.368498", "modified_by": "Administrator", "module": "Geo", "name": "Addresses And Contacts", "owner": "Administrator", "ref_doctype": "Address", "report_name": "Addresses And Contacts", - "report_type": "Script Report" + "report_type": "Script Report", + "roles": [ + { + "role": "Sales User" + }, + { + "role": "Purchase User" + }, + { + "role": "Maintenance User" + }, + { + "role": "Accounts User" + } + ] } \ No newline at end of file diff --git a/frappe/modules/import_file.py b/frappe/modules/import_file.py index b7697ca209..e92ab49ca8 100644 --- a/frappe/modules/import_file.py +++ b/frappe/modules/import_file.py @@ -89,7 +89,7 @@ ignore_values = { "Print Format": ["disabled"] } -ignore_doctypes = ["Has Role"] +ignore_doctypes = [""] def import_doc(docdict, force=False, data_import=False, pre_process=None, ignore_version=None, reset_permissions=False): diff --git a/frappe/patches/v7_3/set_ref_doctype_roles_to_report.py b/frappe/patches/v7_3/set_ref_doctype_roles_to_report.py index 95c8323df5..3ea9c6017a 100644 --- a/frappe/patches/v7_3/set_ref_doctype_roles_to_report.py +++ b/frappe/patches/v7_3/set_ref_doctype_roles_to_report.py @@ -5,7 +5,7 @@ from __future__ import unicode_literals import frappe def execute(): - for data in frappe.get_all('Report', fields=["name"], filters={'is_standard': 'No'}): + for data in frappe.get_all('Report', fields=["name"]): doc = frappe.get_doc('Report', data.name) doc.set_doctype_roles() for row in doc.roles: