From f8c84c45b58d2eb4533613c4a4dea13988d43fe7 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Mon, 13 Mar 2017 11:16:53 +0530 Subject: [PATCH] [fix] reordering patch to avoid circular dependency --- frappe/patches.txt | 5 +++-- frappe/patches/v7_2/setup_custom_perms.py | 4 ---- frappe/patches/v8_0/drop_is_custom_from_docperm.py | 7 +++++++ 3 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 frappe/patches/v8_0/drop_is_custom_from_docperm.py diff --git a/frappe/patches.txt b/frappe/patches.txt index 99f851c75b..3cda981d6f 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -1,5 +1,6 @@ execute:frappe.db.sql("""update `tabPatch Log` set patch=replace(patch, '.4_0.', '.v4_0.')""") #2014-05-12 frappe.patches.v5_0.convert_to_barracuda_and_utf8mb4 +execute:frappe.utils.global_search.setup_global_search_table() frappe.patches.v7_0.update_auth frappe.patches.v7_1.rename_scheduler_log_to_error_log frappe.patches.v6_1.rename_file_data @@ -8,10 +9,10 @@ frappe.patches.v7_2.remove_in_filter execute:frappe.reload_doc('core', 'doctype', 'doctype', force=True) #2017-03-09 execute:frappe.reload_doc('core', 'doctype', 'docfield', force=True) #2017-03-03 execute:frappe.reload_doc('core', 'doctype', 'docperm') #2017-03-03 +frappe.patches.v8_0.drop_is_custom_from_docperm execute:frappe.reload_doc('core', 'doctype', 'custom_docperm') -frappe.patches.v7_2.setup_custom_perms #2017-01-19 frappe.patches.v8_0.rename_page_role_to_has_role -execute:frappe.utils.global_search.setup_global_search_table() +frappe.patches.v7_2.setup_custom_perms #2017-01-19 frappe.patches.v8_0.drop_in_dialog execute:frappe.reload_doc('core', 'doctype', 'role') execute:frappe.reload_doc('core', 'doctype', 'user') diff --git a/frappe/patches/v7_2/setup_custom_perms.py b/frappe/patches/v7_2/setup_custom_perms.py index d3545ab6c5..7b6aadc360 100644 --- a/frappe/patches/v7_2/setup_custom_perms.py +++ b/frappe/patches/v7_2/setup_custom_perms.py @@ -7,10 +7,6 @@ Copy DocPerm to Custom DocPerm where permissions are set differently ''' def execute(): - frappe.reload_doctype('DocPerm') - if frappe.db.has_column('DocPerm', 'is_custom'): - frappe.db.commit() - frappe.db.sql('alter table `tabDocPerm` drop column is_custom') docperm_meta = frappe.get_meta('DocPerm') for d in frappe.db.get_all('DocType', dict(istable=0, issingle=0, custom=0)): perms = frappe.get_all('DocPerm', fields='*', filters=dict(parent=d.name), order_by='idx asc') diff --git a/frappe/patches/v8_0/drop_is_custom_from_docperm.py b/frappe/patches/v8_0/drop_is_custom_from_docperm.py new file mode 100644 index 0000000000..c4e457d813 --- /dev/null +++ b/frappe/patches/v8_0/drop_is_custom_from_docperm.py @@ -0,0 +1,7 @@ +import frappe + +def execute(): + frappe.reload_doctype('DocPerm') + if frappe.db.has_column('DocPerm', 'is_custom'): + frappe.db.commit() + frappe.db.sql('alter table `tabDocPerm` drop column is_custom') \ No newline at end of file