From 767099268aa97eb39b650294b8ca6ea4343c52af Mon Sep 17 00:00:00 2001 From: sokumon Date: Mon, 20 Apr 2026 01:29:11 +0530 Subject: [PATCH] fix: consider default workspace after login --- frappe/utils/data.py | 8 ++++++++ frappe/website/utils.py | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/frappe/utils/data.py b/frappe/utils/data.py index 821ce14873..d06428df54 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -1928,6 +1928,14 @@ def get_link_to_form(doctype: str, name: str | None = None, label: str | None = return f"""{label}""" +def get_url_to_workspace(workspace: str, is_public: bool): + url_prefix = "/desk/" + if not is_public: + workspace_url = "/desk/private/" + workspace_url = url_prefix + workspace.lower() + return workspace_url + + def get_link_to_report( name: str, label: str | None = None, diff --git a/frappe/website/utils.py b/frappe/website/utils.py index 62e18143f9..bc969410b6 100644 --- a/frappe/website/utils.py +++ b/frappe/website/utils.py @@ -20,6 +20,7 @@ from frappe.utils import ( get_system_timezone, md_to_html, ) +from frappe.utils.data import get_url_to_workspace from frappe.utils.user import is_portal_user FRONTMATTER_PATTERN = re.compile(r"^\s*(?:---|\+\+\+)(.*?)(?:---|\+\+\+)\s*(.+)$", re.S | re.M) @@ -100,7 +101,6 @@ def get_home_page(): def _get_home_page(): home_page = None - # for user if frappe.session.user != "Guest": # by role @@ -129,6 +129,11 @@ def get_home_page(): home_page = "desk" if home_page == "me" and is_portal_user(): home_page = "portal" + + default_workspace = frappe.get_user().load_user().default_workspace + if default_workspace: + home_page = get_url_to_workspace(default_workspace["name"], default_workspace["public"]) + return home_page return home_page if frappe._dev_server: