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

Merge pull request #39071 from KerollesFathy/fix/workspace-private-routing

Browse source
This commit is contained in:
Soham Kulkarni 2026-05-04 22:35:24 +05:30 • committed by GitHub
commit 481a886a2e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frappe/desk/doctype/workspace/workspace.js
View file

@ -11,8 +11,8 @@ frappe.ui.form.on("Workspace", {
frm.trigger("add_to_desktop"); frm.trigger("add_to_desktop");
let url = `/desk/${ let url = `/desk/${
frm.doc.public frm.doc.public
? frappe.router.slug(frm.doc.title) ? frappe.router.slug(frm.doc.name)
: "private/" + frappe.router.slug(frm.doc.title) : "private/" + frappe.router.slug(frm.doc.name)
}`; }`;
frm.sidebar frm.sidebar
.add_user_action(__("Go to Workspace")) .add_user_action(__("Go to Workspace"))

13
frappe/public/js/frappe/views/workspace/workspace.js
View file

@ -538,8 +538,9 @@ frappe.views.Workspace = class Workspace {
} }
this.create_page(new_page).then(() => { this.create_page(new_page).then(() => {
let pre_url = new_page.public ? "" : "private/"; let route = frappe.router.slug(
let route = pre_url + frappe.router.slug(new_page.title); new_page.public ? new_page.name : "private/" + new_page.name
);
frappe.set_route(route); frappe.set_route(route);
}); });
}); });
@ -758,13 +759,9 @@ frappe.views.Workspace = class Workspace {
indicator: "green", indicator: "green",
}); });
if (page.public) { if (page.public) {
frappe.set_route("desk", frappe.router.slug(page.title)); frappe.set_route("desk", frappe.router.slug(page.name));
} else { } else {
frappe.set_route( frappe.set_route("desk", "private", frappe.router.slug(page.name));
"desk",
"private",
frappe.router.slug(page.title)
);
} }
} }
}, },