From 95db98b6eaaf2b36dd95d60a008570565147060e Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Thu, 14 Jan 2021 18:16:50 +0530 Subject: [PATCH] feat: ability to set default desk page --- frappe/desk/desktop.py | 15 ++++++++++++--- frappe/desk/doctype/desk_page/desk_page.json | 10 +++++++++- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 4dab313892..a476573b1a 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -108,9 +108,18 @@ class Workspace: 'extends': self.page_name, 'for_user': frappe.session.user } - pages = frappe.get_all("Desk Page", filters=filters, limit=1) - if pages: - return frappe.get_cached_doc("Desk Page", pages[0]) + user_pages = frappe.get_all("Desk Page", filters=filters, limit=1) + if user_pages: + return frappe.get_cached_doc("Desk Page", user_pages[0]) + + filters = { + 'extends_another_page': 1, + 'extends': self.page_name, + 'is_default': 1 + } + default_page = frappe.get_all("Desk Page", filters=filters, limit=1) + if default_page: + return frappe.get_cached_doc("Desk Page", default_page[0]) self.get_pages_to_extend() return frappe.get_cached_doc("Desk Page", self.page_name) diff --git a/frappe/desk/doctype/desk_page/desk_page.json b/frappe/desk/doctype/desk_page/desk_page.json index 2b8aea5e6c..622193f16d 100644 --- a/frappe/desk/doctype/desk_page/desk_page.json +++ b/frappe/desk/doctype/desk_page/desk_page.json @@ -16,6 +16,7 @@ "onboarding", "column_break_3", "extends_another_page", + "is_default", "is_standard", "developer_mode_only", "disable_user_customization", @@ -197,10 +198,17 @@ "fieldname": "hide_custom", "fieldtype": "Check", "label": "Hide Custom DocTypes and Reports" + }, + { + "default": "0", + "depends_on": "extends_another_page", + "fieldname": "is_default", + "fieldtype": "Check", + "label": "Is Default" } ], "links": [], - "modified": "2020-05-18 19:17:27.206646", + "modified": "2021-01-14 17:55:53.923442", "modified_by": "Administrator", "module": "Desk", "name": "Desk Page",