From b424564ad47bc7cf59da3b730a871cb581ee5ced Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Wed, 22 Feb 2017 15:04:29 +0530
Subject: [PATCH] shows roles on page and report for standard only

---
 frappe/core/doctype/page/page.json     | 24 +++++++++++++++++++++++-
 frappe/core/doctype/report/report.json |  7 ++++++-
 frappe/core/doctype/report/report.py   |  4 +++-
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/frappe/core/doctype/page/page.json b/frappe/core/doctype/page/page.json
index 5f902144e2..ecf1fe0aab 100644
--- a/frappe/core/doctype/page/page.json
+++ b/frappe/core/doctype/page/page.json
@@ -8,6 +8,7 @@
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "document_type": "System", 
  "editable_grid": 0, 
  "engine": "InnoDB", 
  "fields": [
@@ -21,6 +22,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Page HTML", 
@@ -48,6 +51,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Page Name", 
@@ -76,6 +81,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Title", 
@@ -102,6 +109,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "icon", 
@@ -128,6 +137,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -153,6 +164,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Module", 
@@ -182,6 +195,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Standard", 
@@ -211,6 +226,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -231,11 +248,14 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "eval:doc.standard == 'Yes'", 
    "fieldname": "roles", 
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Roles", 
@@ -267,7 +287,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-02-13 13:58:37.481593", 
+ "modified": "2017-02-22 14:42:19.434501", 
  "modified_by": "Administrator", 
  "module": "Core", 
  "name": "Page", 
@@ -317,6 +337,8 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_order": "ASC", 
  "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/frappe/core/doctype/report/report.json b/frappe/core/doctype/report/report.json
index 49f4809e70..1f9e3871e9 100644
--- a/frappe/core/doctype/report/report.json
+++ b/frappe/core/doctype/report/report.json
@@ -425,6 +425,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "", 
@@ -447,11 +449,14 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "eval:doc.is_standard == 'Yes'", 
    "fieldname": "roles", 
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Roles", 
@@ -482,7 +487,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-02-17 16:41:40.315658", 
+ "modified": "2017-02-22 14:42:06.597755", 
  "modified_by": "Administrator", 
  "module": "Core", 
  "name": "Report", 
diff --git a/frappe/core/doctype/report/report.py b/frappe/core/doctype/report/report.py
index dfaa2f3b2c..d3357373e4 100644
--- a/frappe/core/doctype/report/report.py
+++ b/frappe/core/doctype/report/report.py
@@ -35,11 +35,13 @@ class Report(Document):
 		if self.report_type == "Report Builder":
 			self.update_report_json()
 
+		self.set_doctype_roles()
+
 	def on_update(self):
 		self.export_doc()
 
 	def set_doctype_roles(self):
-		if self.roles: return
+		if self.get('roles'): return
 
 		doc = frappe.get_meta(self.ref_doctype)
 		roles = [{'role': d.role} for d in doc.permissions]