From 33b49b4d46ed924fd28f412dfaf7877224eee71b Mon Sep 17 00:00:00 2001 From: phot0n Date: Mon, 2 May 2022 19:54:32 +0530 Subject: [PATCH 1/3] refactor(minor): remove is_first_startup from System Settings --- .../core/doctype/system_settings/system_settings.json | 11 +---------- frappe/desk/page/setup_wizard/setup_wizard.py | 6 ------ frappe/sessions.py | 3 --- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/frappe/core/doctype/system_settings/system_settings.json b/frappe/core/doctype/system_settings/system_settings.json index 0c9b87e618..ffd671ee2b 100644 --- a/frappe/core/doctype/system_settings/system_settings.json +++ b/frappe/core/doctype/system_settings/system_settings.json @@ -11,7 +11,6 @@ "language", "column_break_3", "time_zone", - "is_first_startup", "enable_onboarding", "setup_complete", "date_and_number_format", @@ -103,14 +102,6 @@ "read_only": 1, "reqd": 1 }, - { - "default": "0", - "fieldname": "is_first_startup", - "fieldtype": "Check", - "hidden": 1, - "label": "Is First Startup", - "read_only": 1 - }, { "default": "0", "fieldname": "setup_complete", @@ -502,7 +493,7 @@ "icon": "fa fa-cog", "issingle": 1, "links": [], - "modified": "2022-04-21 09:11:35.218721", + "modified": "2022-05-02 18:53:35.218721", "modified_by": "Administrator", "module": "Core", "name": "System Settings", diff --git a/frappe/desk/page/setup_wizard/setup_wizard.py b/frappe/desk/page/setup_wizard/setup_wizard.py index f85d24704f..3f849bbcaa 100755 --- a/frappe/desk/page/setup_wizard/setup_wizard.py +++ b/frappe/desk/page/setup_wizard/setup_wizard.py @@ -269,7 +269,6 @@ def add_all_roles_to(name): def disable_future_access(): frappe.db.set_default("desktop:home_page", "workspace") frappe.db.set_value("System Settings", "System Settings", "setup_complete", 1) - frappe.db.set_value("System Settings", "System Settings", "is_first_startup", 1) # Enable onboarding after install frappe.db.set_value("System Settings", "System Settings", "enable_onboarding", 1) @@ -334,11 +333,6 @@ def load_user_details(): } -@frappe.whitelist() -def reset_is_first_startup(): - frappe.db.set_value("System Settings", "System Settings", "is_first_startup", 0) - - def prettify_args(args): # remove attachments for key, val in args.items(): diff --git a/frappe/sessions.py b/frappe/sessions.py index d701ac24a7..c07bd7495b 100644 --- a/frappe/sessions.py +++ b/frappe/sessions.py @@ -187,9 +187,6 @@ def get(): bootinfo["disable_async"] = frappe.conf.disable_async bootinfo["setup_complete"] = cint(frappe.db.get_single_value("System Settings", "setup_complete")) - bootinfo["is_first_startup"] = cint( - frappe.db.get_single_value("System Settings", "is_first_startup") - ) bootinfo["desk_theme"] = frappe.db.get_value("User", frappe.session.user, "desk_theme") or "Light" From ff080cde5a447c15f68b576966e458732d759039 Mon Sep 17 00:00:00 2001 From: phot0n Date: Wed, 4 May 2022 10:43:43 +0530 Subject: [PATCH 2/3] minor: add patch for removing is_first_startup field --- frappe/patches.txt | 1 + frappe/patches/v14_0/remove_is_first_startup.py | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 frappe/patches/v14_0/remove_is_first_startup.py diff --git a/frappe/patches.txt b/frappe/patches.txt index 845ccee09a..80f4e382e3 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -189,6 +189,7 @@ 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 [post_model_sync] frappe.patches.v14_0.drop_data_import_legacy diff --git a/frappe/patches/v14_0/remove_is_first_startup.py b/frappe/patches/v14_0/remove_is_first_startup.py new file mode 100644 index 0000000000..b7d34204e5 --- /dev/null +++ b/frappe/patches/v14_0/remove_is_first_startup.py @@ -0,0 +1,7 @@ +import frappe + + +def execute(): + frappe.db.sql( + """DELETE FROM `tabSingles` where doctype = 'System Settings' and field = 'is_first_startup'""" + ) From cd4b1ebe8f088a711ad187b94f10d1ccd59a1660 Mon Sep 17 00:00:00 2001 From: phot0n Date: Wed, 4 May 2022 13:35:57 +0530 Subject: [PATCH 3/3] chore: use qb for patch --- frappe/patches/v14_0/remove_is_first_startup.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/frappe/patches/v14_0/remove_is_first_startup.py b/frappe/patches/v14_0/remove_is_first_startup.py index b7d34204e5..cae38ce2ab 100644 --- a/frappe/patches/v14_0/remove_is_first_startup.py +++ b/frappe/patches/v14_0/remove_is_first_startup.py @@ -2,6 +2,7 @@ import frappe def execute(): - frappe.db.sql( - """DELETE FROM `tabSingles` where doctype = 'System Settings' and field = 'is_first_startup'""" - ) + singles = frappe.qb.Table("tabSingles") + frappe.qb.from_(singles).delete().where( + (singles.doctype == "System Settings") & (singles.field == "is_first_startup") + ).run()