vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #20730 from surajshetty3416/fix-misc-17-10

Browse source
This commit is contained in:
Suraj Shetty 2023-04-17 12:47:10 +05:30 • committed by GitHub
commit 06cf10edf1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
frappe/core/doctype/data_import/exporter.py
View file

@ -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,

1
frappe/patches.txt
View file

@ -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.remove_background_jobs_from_dropdown

9
frappe/patches/v15_0/remove_background_jobs_from_dropdown.py Normal file
View file

@ -0,0 +1,9 @@
import frappe
def execute():
item = frappe.db.exists("Navbar Item", {"item_label": "Background Jobs"})
if not item:
return
frappe.delete_doc("Navbar Item", item)

4
frappe/public/js/frappe/model/perm.js
View file

@ -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];
},

9
frappe/public/js/frappe/ui/toolbar/toolbar.js
View file

@ -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();
@ -133,6 +136,12 @@ frappe.ui.toolbar.Toolbar = class {
frappe.utils.generate_tracking_url,
__("Generate Tracking URL")
);
if (frappe.perm.has_perm("RQ Job")) {
frappe.search.utils.make_function_searchable(function () {
frappe.set_route("List", "RQ Job");
}, __("Background Jobs"));
}
}
}