From 1285d84aa75bd85921c6857bfc962e6523aa3f77 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Sat, 3 Sep 2022 15:07:24 +0530 Subject: [PATCH 1/2] fix: show unique workspaces in sidebar (cherry picked from commit 7331e3a7be0ebbe559a41babe791331eaa86f9f3) --- frappe/public/js/frappe/views/workspace/workspace.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 88ff21caa7..f5fdab24ab 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -117,6 +117,7 @@ frappe.views.Workspace = class Workspace { (page) => page.parent_page == "" || page.parent_page == null ); } + root_pages = root_pages.uniqBy((d) => d.title); this.build_sidebar_section(category, root_pages); }); From 434ed3d153380d8829e9b783f839d58b0965c859 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Sat, 3 Sep 2022 15:08:57 +0530 Subject: [PATCH 2/2] fix: do not remove workspaces while app is uninstalled (cherry picked from commit cab95e12f4a2de96e7e85bd4f76d828f7ab0a2a1) --- frappe/desk/doctype/workspace/workspace.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index a3c4fe33cc..82077cc59c 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -138,6 +138,7 @@ class Workspace(Document): def disable_saving_as_public(): return ( frappe.flags.in_install + or frappe.flags.in_uninstall or frappe.flags.in_patch or frappe.flags.in_test or frappe.flags.in_fixtures