From ca82c70be3309d056dceb0f8976048a90f7b4766 Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Thu, 16 Mar 2017 18:02:44 +0530
Subject: [PATCH] [fix] Patch rename_page_role_to_has_role

---
 frappe/patches.txt                            |  4 +--
 .../v8_0/rename_page_role_to_has_role.py      | 29 ++++++++++---------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/frappe/patches.txt b/frappe/patches.txt
index 5dc6626976..35e8e4491a 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -14,12 +14,12 @@ frappe.patches.v8_0.drop_is_custom_from_docperm
 frappe.patches.v8_0.drop_in_dialog
 frappe.patches.v8_0.update_published_in_global_search
 execute:frappe.reload_doc('core', 'doctype', 'custom_docperm')
-frappe.patches.v8_0.rename_page_role_to_has_role
+execute:frappe.reload_doc('core', 'doctype', 'deleted_document')
+frappe.patches.v8_0.rename_page_role_to_has_role #2017-03-16
 frappe.patches.v7_2.setup_custom_perms #2017-01-19
 frappe.patches.v8_0.set_user_permission_for_page_and_report
 execute:frappe.reload_doc('core', 'doctype', 'role')
 execute:frappe.reload_doc('core', 'doctype', 'user')
-execute:frappe.reload_doc('core', 'doctype', 'deleted_document')
 execute:frappe.reload_doc('custom', 'doctype', 'custom_field') #2015-10-19
 execute:frappe.reload_doc('core', 'doctype', 'page') #2013-13-26
 execute:frappe.reload_doc('core', 'doctype', 'report') #2014-06-03
diff --git a/frappe/patches/v8_0/rename_page_role_to_has_role.py b/frappe/patches/v8_0/rename_page_role_to_has_role.py
index 445d437b6a..9c610d857d 100644
--- a/frappe/patches/v8_0/rename_page_role_to_has_role.py
+++ b/frappe/patches/v8_0/rename_page_role_to_has_role.py
@@ -7,10 +7,10 @@ import frappe
 def execute():
 	if not frappe.db.exists('DocType', 'Has Role'):
 		frappe.rename_doc('DocType', 'Page Role', 'Has Role')
-		reload_doc()
-		set_ref_doctype_roles_to_report()
-		copy_user_roles_to_has_roles()
-		remove_doctypes()
+	reload_doc()
+	set_ref_doctype_roles_to_report()
+	copy_user_roles_to_has_roles()
+	remove_doctypes()
 
 def reload_doc():
 	frappe.reload_doc("core", 'doctype', "page")
@@ -30,16 +30,17 @@ def set_ref_doctype_roles_to_report():
 				pass
 
 def copy_user_roles_to_has_roles():
-	for data in frappe.get_all('User', fields = ["name"]):
-		doc = frappe.get_doc('User', data.name)
-		doc.set('roles',[])
-		for args in frappe.get_all('UserRole', fields = ["role"], 
-			filters = {'parent': data.name, 'parenttype': 'User'}):
-			doc.append('roles', {
-				'role': args.role
-			})
-		for role in doc.roles:
-			role.db_update()
+	if frappe.db.exists('DocType', 'UserRole'):
+		for data in frappe.get_all('User', fields = ["name"]):
+			doc = frappe.get_doc('User', data.name)
+			doc.set('roles',[])
+			for args in frappe.get_all('UserRole', fields = ["role"],
+				filters = {'parent': data.name, 'parenttype': 'User'}):
+				doc.append('roles', {
+					'role': args.role
+				})
+			for role in doc.roles:
+				role.db_update()
 
 def remove_doctypes():
 	for doctype in ['UserRole', 'Event Role']: