fix: consider default workspace after login
This commit is contained in:
parent
37b05961c7
commit
767099268a
2 changed files with 14 additions and 1 deletions
|
|
@ -1928,6 +1928,14 @@ def get_link_to_form(doctype: str, name: str | None = None, label: str | None =
|
|||
return f"""<a href="{get_url_to_form(doctype, name)}">{label}</a>"""
|
||||
|
||||
|
||||
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,
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue