From eced6a3dc1c07fab648a122a16ab06f9946b99b2 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 17 Apr 2023 10:09:20 +0530 Subject: [PATCH 1/6] fix(export): Use fieldname if label is not set --- frappe/core/doctype/data_import/exporter.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/data_import/exporter.py b/frappe/core/doctype/data_import/exporter.py index 1066b8bed9..2c9bfd95fd 100644 --- a/frappe/core/doctype/data_import/exporter.py +++ b/frappe/core/doctype/data_import/exporter.py @@ -205,9 +205,11 @@ class Exporter: for df in self.fields: is_parent = not df.is_child_table_field if is_parent: - label = _(df.label) + label = _(df.label or df.fieldname) else: - label = f"{_(df.label)} ({_(df.child_table_df.label)})" + label = ( + f"{_(df.label or df.fieldname)} ({_(df.child_table_df.label or df.child_table_df.fieldname)})" + ) if label in header: # this label is already in the header, From 1053fba273b9f3544d2b82766c8471dc550bc4c0 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 17 Apr 2023 11:18:58 +0530 Subject: [PATCH 2/6] fix: Patch to update Background Jobs URL --- frappe/patches.txt | 1 + frappe/patches/v15_0/update_background_jobs_url.py | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 frappe/patches/v15_0/update_background_jobs_url.py diff --git a/frappe/patches.txt b/frappe/patches.txt index da83094961..cd3d393be6 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -223,3 +223,4 @@ 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.update_background_jobs_url \ No newline at end of file diff --git a/frappe/patches/v15_0/update_background_jobs_url.py b/frappe/patches/v15_0/update_background_jobs_url.py new file mode 100644 index 0000000000..2661901459 --- /dev/null +++ b/frappe/patches/v15_0/update_background_jobs_url.py @@ -0,0 +1,9 @@ +import frappe + + +def execute(): + item = frappe.db.exists("Navbar Item", {"item_label": "Background Jobs"}) + if not item: + return + + frappe.set_value("Navbar Item", item, "route", "/app/rq-job") From c262eaf18d9153684e6cf3548ca461e5cd41c8ed Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 17 Apr 2023 11:19:19 +0530 Subject: [PATCH 3/6] fix: Redirect Background Jobs to RQ Jobs --- frappe/public/js/frappe/ui/toolbar/toolbar.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frappe/public/js/frappe/ui/toolbar/toolbar.js b/frappe/public/js/frappe/ui/toolbar/toolbar.js index 419a22d764..f74e47079a 100644 --- a/frappe/public/js/frappe/ui/toolbar/toolbar.js +++ b/frappe/public/js/frappe/ui/toolbar/toolbar.js @@ -133,6 +133,10 @@ frappe.ui.toolbar.Toolbar = class { frappe.utils.generate_tracking_url, __("Generate Tracking URL") ); + + frappe.search.utils.make_function_searchable(function () { + frappe.set_route("List", "RQ Job"); + }, __("Background Jobs")); } } From 52d284ff0f73b9ab781c59bfcbd3709f4da10380 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 17 Apr 2023 11:43:36 +0530 Subject: [PATCH 4/6] fix: Hide dropdown menu on click --- frappe/public/js/frappe/ui/toolbar/toolbar.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frappe/public/js/frappe/ui/toolbar/toolbar.js b/frappe/public/js/frappe/ui/toolbar/toolbar.js index f74e47079a..6a2dac588c 100644 --- a/frappe/public/js/frappe/ui/toolbar/toolbar.js +++ b/frappe/public/js/frappe/ui/toolbar/toolbar.js @@ -13,6 +13,9 @@ frappe.ui.toolbar.Toolbar = class { }) ); $(".dropdown-toggle").dropdown(); + $("#toolbar-user a[href]").click(function () { + $(this).closest(".dropdown-menu").prev().dropdown("toggle"); + }); this.setup_awesomebar(); this.setup_notifications(); From cdb943d49ae10d55cffd900f3eb5d0effc7ccbe1 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 17 Apr 2023 12:03:43 +0530 Subject: [PATCH 5/6] fix: Show background jobs only to permitted users --- frappe/public/js/frappe/model/perm.js | 4 +--- frappe/public/js/frappe/ui/toolbar/toolbar.js | 8 +++++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frappe/public/js/frappe/model/perm.js b/frappe/public/js/frappe/model/perm.js index 8ed7d6b028..948a31b1fc 100644 --- a/frappe/public/js/frappe/model/perm.js +++ b/frappe/public/js/frappe/model/perm.js @@ -34,9 +34,7 @@ $.extend(frappe.perm, { doctype_perm: {}, - has_perm: (doctype, permlevel, ptype, doc) => { - if (!permlevel) permlevel = 0; - + has_perm: (doctype, permlevel = 0, ptype = "read", doc) => { const perms = frappe.perm.get_perm(doctype, doc); return !!perms?.[permlevel]?.[ptype]; }, diff --git a/frappe/public/js/frappe/ui/toolbar/toolbar.js b/frappe/public/js/frappe/ui/toolbar/toolbar.js index 6a2dac588c..bef0c19b4e 100644 --- a/frappe/public/js/frappe/ui/toolbar/toolbar.js +++ b/frappe/public/js/frappe/ui/toolbar/toolbar.js @@ -137,9 +137,11 @@ frappe.ui.toolbar.Toolbar = class { __("Generate Tracking URL") ); - frappe.search.utils.make_function_searchable(function () { - frappe.set_route("List", "RQ Job"); - }, __("Background Jobs")); + if (frappe.perm.has_perm("RQ Job")) { + frappe.search.utils.make_function_searchable(function () { + frappe.set_route("List", "RQ Job"); + }, __("Background Jobs")); + } } } From 9938ab0f447bac7a678975e0481249102691b99f Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 17 Apr 2023 12:16:30 +0530 Subject: [PATCH 6/6] fix: Remove Background Jobs from dropdown --- frappe/patches.txt | 2 +- ...ound_jobs_url.py => remove_background_jobs_from_dropdown.py} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename frappe/patches/v15_0/{update_background_jobs_url.py => remove_background_jobs_from_dropdown.py} (67%) diff --git a/frappe/patches.txt b/frappe/patches.txt index cd3d393be6..e5fe1a9a75 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -223,4 +223,4 @@ 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.update_background_jobs_url \ No newline at end of file +frappe.patches.v15_0.remove_background_jobs_from_dropdown \ No newline at end of file diff --git a/frappe/patches/v15_0/update_background_jobs_url.py b/frappe/patches/v15_0/remove_background_jobs_from_dropdown.py similarity index 67% rename from frappe/patches/v15_0/update_background_jobs_url.py rename to frappe/patches/v15_0/remove_background_jobs_from_dropdown.py index 2661901459..b070e0805c 100644 --- a/frappe/patches/v15_0/update_background_jobs_url.py +++ b/frappe/patches/v15_0/remove_background_jobs_from_dropdown.py @@ -6,4 +6,4 @@ def execute(): if not item: return - frappe.set_value("Navbar Item", item, "route", "/app/rq-job") + frappe.delete_doc("Navbar Item", item)