From 0d22bde0c7ee496b0b0bd6684da61f01226b9ceb Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 27 May 2015 13:19:53 +0530 Subject: [PATCH 1/3] Fixed _idx property as per renamed fields --- frappe/patches.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/patches.txt b/frappe/patches.txt index cca44b24d9..4eda372c66 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -73,7 +73,6 @@ frappe.patches.v5_0.fix_email_alert frappe.patches.v5_0.fix_null_date_datetime frappe.patches.v5_0.force_sync_website execute:frappe.delete_doc("DocType", "Tag") -execute:frappe.db.sql("delete from `tabProperty Setter` where `property` in ('idx', '_idx')") frappe.patches.v5_0.move_scheduler_last_event_to_system_settings execute:frappe.db.sql("update tabUser set new_password='' where ifnull(new_password, '')!=''") frappe.patches.v5_0.fix_text_editor_file_urls From be4690111e13617bad454ff5ccf6ee26f864b2d7 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 27 May 2015 16:00:43 +0530 Subject: [PATCH 2/3] [fix] update reports while field renaming --- frappe/model/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/model/__init__.py b/frappe/model/__init__.py index 642952069c..ab3630ec59 100644 --- a/frappe/model/__init__.py +++ b/frappe/model/__init__.py @@ -133,7 +133,7 @@ def update_reports(doctype, old_fieldname, new_fieldname): # update filters new_filters = [] for f in report_dict.get("filters"): - if f[0] == doctype and f[1] == old_fieldname: + if f and len(f) > 1 and f[0] == doctype and f[1] == old_fieldname: new_filters.append([doctype, new_fieldname, f[2], f[3]]) report_dict["updated"] = True else: @@ -142,7 +142,7 @@ def update_reports(doctype, old_fieldname, new_fieldname): # update columns new_columns = [] for c in report_dict.get("columns"): - if c[0] == old_fieldname and c[1] == doctype: + if c and len(c) > 1 and c[0] == old_fieldname and c[1] == doctype: new_columns.append([new_fieldname, doctype]) report_dict["updated"] = True else: From ad65d40a9315314824510b7470589e489626405d Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 27 May 2015 16:17:29 +0530 Subject: [PATCH 3/3] remove idx property setters --- frappe/patches.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/patches.txt b/frappe/patches.txt index 4eda372c66..cca44b24d9 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -73,6 +73,7 @@ frappe.patches.v5_0.fix_email_alert frappe.patches.v5_0.fix_null_date_datetime frappe.patches.v5_0.force_sync_website execute:frappe.delete_doc("DocType", "Tag") +execute:frappe.db.sql("delete from `tabProperty Setter` where `property` in ('idx', '_idx')") frappe.patches.v5_0.move_scheduler_last_event_to_system_settings execute:frappe.db.sql("update tabUser set new_password='' where ifnull(new_password, '')!=''") frappe.patches.v5_0.fix_text_editor_file_urls