From ba9e2aab175bd185bddf54d7ac8859a228c46140 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Mon, 5 Jun 2023 22:11:42 +0530 Subject: [PATCH 1/2] fix: avoid loading workspace content if already loaded --- frappe/public/js/frappe/views/workspace/workspace.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index b5fb0e2e54..894844497b 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -22,6 +22,7 @@ frappe.views.Workspace = class Workspace { this.page = wrapper.page; this.blocks = frappe.workspace_block.blocks; this.is_read_only = true; + this.is_page_loaded = false; this.pages = {}; this.sorted_public_items = []; this.sorted_private_items = []; @@ -248,10 +249,14 @@ frappe.views.Workspace = class Workspace { this.update_selected_sidebar(page, true); //add selected on new page if (!frappe.router.current_route[0]) { + this.is_page_loaded = true; frappe.set_route(frappe.router.slug(page.public ? page.name : "private/" + page.name)); } - this.show_page(page); + if (!this.is_page_loaded) { + this.show_page(page); + this.is_page_loaded = false; + } } update_selected_sidebar(page, add) { From 4f459f7146ee2dec1c3ba113554543fa251004b1 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Tue, 6 Jun 2023 08:07:01 +0530 Subject: [PATCH 2/2] fix(unrelated): make create doctype using form builder default button --- frappe/core/doctype/doctype/doctype_list.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/core/doctype/doctype/doctype_list.js b/frappe/core/doctype/doctype/doctype_list.js index c66edf1e21..f4811fa01d 100644 --- a/frappe/core/doctype/doctype/doctype_list.js +++ b/frappe/core/doctype/doctype/doctype_list.js @@ -6,16 +6,16 @@ frappe.listview_settings["DocType"] = { setup_select_primary_button: function (me) { let actions = [ - { - label: __("Add DocType"), - description: __("Create a new DocType"), - action: () => frappe.new_doc("DocType"), - }, { label: __("Add DocType (Form Builder)"), description: __("Use the form builder to create a new DocType"), action: () => frappe.set_route("form-builder", "new-doctype"), }, + { + label: __("Add DocType"), + description: __("Create a new DocType"), + action: () => frappe.new_doc("DocType"), + }, ]; frappe.utils.add_select_group_button(