From c189b7e6224f0d9103fd9e59a3e503c20e8942e0 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Fri, 15 Sep 2023 15:56:43 +0530 Subject: [PATCH] revert: syncing of report and pages --- frappe/migrate.py | 2 -- frappe/model/sync.py | 53 +------------------------------------------- frappe/patches.txt | 2 ++ 3 files changed, 3 insertions(+), 54 deletions(-) diff --git a/frappe/migrate.py b/frappe/migrate.py index 3f7e13f394..6b83521a7f 100644 --- a/frappe/migrate.py +++ b/frappe/migrate.py @@ -136,8 +136,6 @@ class SiteMigration: sync_languages() flush_deferred_inserts() frappe.model.sync.remove_orphan_doctypes() - frappe.model.sync.remove_orphan_reports() - frappe.model.sync.remove_orphan_pages() frappe.get_single("Portal Settings").sync_menu() frappe.get_single("Installed Applications").update_versions() diff --git a/frappe/model/sync.py b/frappe/model/sync.py index d9b5ebb33d..d582ce783e 100644 --- a/frappe/model/sync.py +++ b/frappe/model/sync.py @@ -143,7 +143,7 @@ def remove_orphan_doctypes(): """Find and remove any orphaned doctypes. These are doctypes for which code and schema file is - delted but entry is present in DocType table. + deleted but entry is present in DocType table. Note: Deleting the entry doesn't delete any data. So this is supposed to be non-destrictive operation. @@ -169,54 +169,3 @@ def remove_orphan_doctypes(): update_progress_bar("Deleting orphaned DocTypes", i, len(orphan_doctypes)) frappe.db.commit() print() - - -def remove_orphan_reports(): - """Find and remove any stale reports.""" - - reports_names = frappe.get_all( - "Report", filters={"is_standard": "Yes"}, fields=["name", "module"] - ) - orphan_reports = [] - for report in reports_names: - path = os.path.join( - frappe.get_module_path(report.module), frappe.scrub("report"), frappe.scrub(report.name) - ) - if not os.path.isdir(path): - orphan_reports.append(report.name) - - if not orphan_reports: - return - - print(f"Orphaned Report(s) found: {', '.join(orphan_reports)}") - for i, name in enumerate(orphan_reports): - frappe.delete_doc("Report", name, force=True, ignore_missing=True) - update_progress_bar("Deleting orpahned Reports", i, len(orphan_reports)) - frappe.db.commit() - print() - - -def remove_orphan_pages(): - """Find and remove any stale pagess.""" - - pages_names = frappe.get_all( - "Page", filters={"standard": "Yes", "system_page": 0}, fields=["name", "module"] - ) - - orphan_pages = [] - for page in pages_names: - path = os.path.join( - frappe.get_module_path(page.module), frappe.scrub("page"), frappe.scrub(page.name) - ) - if not os.path.isdir(path): - orphan_pages.append(page.name) - - if not orphan_pages: - return - - print(f"Orphaned Page(s) found: {', '.join(orphan_pages)}") - for i, name in enumerate(orphan_pages): - frappe.delete_doc("Page", name, force=True, ignore_missing=True) - update_progress_bar("Deleting orphaned Pages", i, len(orphan_pages)) - frappe.db.commit() - print() diff --git a/frappe/patches.txt b/frappe/patches.txt index c5436a5e4f..83db10d905 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -219,7 +219,9 @@ frappe.patches.v14_0.drop_unused_indexes frappe.patches.v15_0.drop_modified_index frappe.patches.v14_0.update_attachment_comment frappe.patches.v15_0.set_contact_full_name +execute:frappe.delete_doc("Page", "activity", force=1) frappe.patches.v14_0.disable_email_accounts_with_oauth +execute:frappe.delete_doc("Page", "translation-tool", force=1) frappe.patches.v15_0.remove_prepared_report_settings_from_system_settings frappe.patches.v14_0.remove_manage_subscriptions_from_navbar frappe.patches.v15_0.remove_background_jobs_from_dropdown