vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #27896 from frappe/login_ws_fix

Browse source 
fix: show first workspace of current selected app on app switch
This commit is contained in:
Sumit Bhanushali 2024-09-25 12:01:27 +05:30 • committed by GitHub
commit f2cf034821
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frappe/public/js/frappe/router.js
View file

@ -470,7 +470,8 @@ frappe.router = {
// 1. User's default workspace in user doctype
// 2. Private home
// 3. Public home
// 4. First workspace in list
// 4. First workspace in list of current app
// 5. First workspace in list
let private_home = `home-${frappe.user.name.toLowerCase()}`;
let default_workspace = frappe.router.slug(frappe.boot.user.default_workspace?.name || "");
@ -478,6 +479,7 @@ frappe.router = {
frappe.workspaces[default_workspace] ||
frappe.workspaces[private_home] ||
frappe.workspaces["home"] ||
Object.values(frappe.workspace_map).find((w) => w.app === frappe.current_app) ||
Object.values(frappe.workspaces)[0];
if (workspace) {