From 19bb79215f66c01db78612669d48ccd3fcca1574 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Thu, 10 Nov 2022 15:18:15 +0530 Subject: [PATCH 1/2] fix: breadcrumbs is broken --- frappe/public/js/frappe/views/breadcrumbs.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/views/breadcrumbs.js b/frappe/public/js/frappe/views/breadcrumbs.js index 8cf9a6ffd7..6736eadf57 100644 --- a/frappe/public/js/frappe/views/breadcrumbs.js +++ b/frappe/public/js/frappe/views/breadcrumbs.js @@ -29,7 +29,7 @@ frappe.breadcrumbs = { return localStorage["preferred_breadcrumbs:" + doctype]; }, - add(module, doctype, type) { + async add(module, doctype, type) { let obj; if (typeof module === "object") { obj = module; @@ -40,6 +40,7 @@ frappe.breadcrumbs = { type: type, }; } + await frappe.model.with_doctype(doctype); this.all[frappe.breadcrumbs.current_page()] = obj; this.update(); }, @@ -131,9 +132,8 @@ frappe.breadcrumbs = { } }, - async set_list_breadcrumb(breadcrumbs) { + set_list_breadcrumb(breadcrumbs) { const doctype = breadcrumbs.doctype; - await frappe.model.with_doctype(doctype); const doctype_meta = frappe.get_doc("DocType", doctype); if ( (doctype === "User" && !frappe.user.has_role("System Manager")) || @@ -185,11 +185,12 @@ frappe.breadcrumbs = { } }, - rename(doctype, old_name, new_name) { + async rename(doctype, old_name, new_name) { var old_route_str = ["Form", doctype, old_name].join("/"); var new_route_str = ["Form", doctype, new_name].join("/"); this.all[new_route_str] = this.all[old_route_str]; delete frappe.breadcrumbs.all[old_route_str]; + await frappe.model.with_doctype(doctype); this.update(); }, From 31415bb72dcbd07a0b7fe7265da6761b1ede5185 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Thu, 10 Nov 2022 17:32:25 +0530 Subject: [PATCH 2/2] revert: async await in breadcrumbs.js --- frappe/public/js/frappe/views/breadcrumbs.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/views/breadcrumbs.js b/frappe/public/js/frappe/views/breadcrumbs.js index 6736eadf57..74560cebbc 100644 --- a/frappe/public/js/frappe/views/breadcrumbs.js +++ b/frappe/public/js/frappe/views/breadcrumbs.js @@ -29,7 +29,7 @@ frappe.breadcrumbs = { return localStorage["preferred_breadcrumbs:" + doctype]; }, - async add(module, doctype, type) { + add(module, doctype, type) { let obj; if (typeof module === "object") { obj = module; @@ -40,7 +40,6 @@ frappe.breadcrumbs = { type: type, }; } - await frappe.model.with_doctype(doctype); this.all[frappe.breadcrumbs.current_page()] = obj; this.update(); }, @@ -185,12 +184,11 @@ frappe.breadcrumbs = { } }, - async rename(doctype, old_name, new_name) { + rename(doctype, old_name, new_name) { var old_route_str = ["Form", doctype, old_name].join("/"); var new_route_str = ["Form", doctype, new_name].join("/"); this.all[new_route_str] = this.all[old_route_str]; delete frappe.breadcrumbs.all[old_route_str]; - await frappe.model.with_doctype(doctype); this.update(); },