From c6d5c6bbe2d5c9f1448b45e2b7e7e2de6ec9e195 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Tue, 21 Jun 2022 21:12:38 +0530 Subject: [PATCH 1/2] fix: Migration failures for version-13 to develop --- frappe/core/doctype/doctype/doctype.py | 2 +- frappe/patches.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index e834b698d5..0d46a2b746 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -1298,7 +1298,7 @@ def validate_fields(meta): frappe.throw(_("Is Published Field must be a valid fieldname"), InvalidFieldNameError) def check_website_search_field(meta): - if not meta.website_search_field: + if not meta.get("website_search_field"): return if meta.website_search_field not in fieldname_list: diff --git a/frappe/patches.txt b/frappe/patches.txt index 66422c7db0..40b5a4c881 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -121,7 +121,7 @@ execute:frappe.delete_doc_if_exists('DocType', 'GCalendar Settings') frappe.patches.v12_0.remove_example_email_thread_notify execute:from frappe.desk.page.setup_wizard.install_fixtures import update_genders;update_genders() frappe.patches.v12_0.set_correct_url_in_files -execute:frappe.reload_doc('core', 'doctype', 'doctype') +execute:frappe.reload_doc('core', 'doctype', 'doctype') #2022-06-21 execute:frappe.reload_doc('custom', 'doctype', 'property_setter') frappe.patches.v13_0.remove_invalid_options_for_data_fields frappe.patches.v13_0.website_theme_custom_scss @@ -184,6 +184,7 @@ frappe.patches.v13_0.jinja_hook frappe.patches.v13_0.update_notification_channel_if_empty frappe.patches.v13_0.set_first_day_of_the_week execute:frappe.reload_doc('custom', 'doctype', 'custom_field') +execute:frappe.reload_doc('desk', 'doctype', 'workspace_quick_list') frappe.patches.v14_0.update_workspace2 # 20.09.2021 frappe.patches.v14_0.save_ratings_in_fraction #23-12-2021 frappe.patches.v14_0.transform_todo_schema From 3ec6f7f470036c2dc3a67014803b00b8a4cd0a65 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Wed, 29 Jun 2022 15:36:18 +0530 Subject: [PATCH 2/2] refactor: merge two workspace2.0 patches --- frappe/patches.txt | 2 -- .../patches/v14_0/reload_workspace_child_tables.py | 13 ------------- frappe/patches/v14_0/update_workspace2.py | 10 ++++++++++ 3 files changed, 10 insertions(+), 15 deletions(-) delete mode 100644 frappe/patches/v14_0/reload_workspace_child_tables.py diff --git a/frappe/patches.txt b/frappe/patches.txt index 40b5a4c881..425468f06c 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -184,14 +184,12 @@ frappe.patches.v13_0.jinja_hook frappe.patches.v13_0.update_notification_channel_if_empty frappe.patches.v13_0.set_first_day_of_the_week execute:frappe.reload_doc('custom', 'doctype', 'custom_field') -execute:frappe.reload_doc('desk', 'doctype', 'workspace_quick_list') frappe.patches.v14_0.update_workspace2 # 20.09.2021 frappe.patches.v14_0.save_ratings_in_fraction #23-12-2021 frappe.patches.v14_0.transform_todo_schema frappe.patches.v14_0.remove_post_and_post_comment frappe.patches.v14_0.reset_creation_datetime frappe.patches.v14_0.remove_is_first_startup -frappe.patches.v14_0.reload_workspace_child_tables frappe.patches.v14_0.clear_long_pending_stale_logs frappe.patches.v14_0.log_settings_migration diff --git a/frappe/patches/v14_0/reload_workspace_child_tables.py b/frappe/patches/v14_0/reload_workspace_child_tables.py deleted file mode 100644 index c22774d94c..0000000000 --- a/frappe/patches/v14_0/reload_workspace_child_tables.py +++ /dev/null @@ -1,13 +0,0 @@ -import frappe - - -def execute(): - child_tables = frappe.get_all( - "DocField", - pluck="options", - filters={"fieldtype": ["in", frappe.model.table_fields], "parent": "Workspace"}, - ) - - for child_table in child_tables: - if child_table != "Has Role": - frappe.reload_doc("desk", "doctype", child_table, force=True) diff --git a/frappe/patches/v14_0/update_workspace2.py b/frappe/patches/v14_0/update_workspace2.py index c6586f46a1..a6c9db503f 100644 --- a/frappe/patches/v14_0/update_workspace2.py +++ b/frappe/patches/v14_0/update_workspace2.py @@ -7,6 +7,16 @@ from frappe import _ def execute(): frappe.reload_doc("desk", "doctype", "workspace", force=True) + child_tables = frappe.get_all( + "DocField", + pluck="options", + filters={"fieldtype": ["in", frappe.model.table_fields], "parent": "Workspace"}, + ) + + for child_table in child_tables: + if child_table != "Has Role": + frappe.reload_doc("desk", "doctype", child_table, force=True) + for seq, workspace in enumerate(frappe.get_all("Workspace", order_by="name asc")): doc = frappe.get_doc("Workspace", workspace.name) content = create_content(doc)