Merge pull request #39071 from KerollesFathy/fix/workspace-private-routing
This commit is contained in:
commit
481a886a2e
2 changed files with 7 additions and 10 deletions
|
|
@ -11,8 +11,8 @@ frappe.ui.form.on("Workspace", {
|
|||
frm.trigger("add_to_desktop");
|
||||
let url = `/desk/${
|
||||
frm.doc.public
|
||||
? frappe.router.slug(frm.doc.title)
|
||||
: "private/" + frappe.router.slug(frm.doc.title)
|
||||
? frappe.router.slug(frm.doc.name)
|
||||
: "private/" + frappe.router.slug(frm.doc.name)
|
||||
}`;
|
||||
frm.sidebar
|
||||
.add_user_action(__("Go to Workspace"))
|
||||
|
|
|
|||
|
|
@ -538,8 +538,9 @@ frappe.views.Workspace = class Workspace {
|
|||
}
|
||||
|
||||
this.create_page(new_page).then(() => {
|
||||
let pre_url = new_page.public ? "" : "private/";
|
||||
let route = pre_url + frappe.router.slug(new_page.title);
|
||||
let route = frappe.router.slug(
|
||||
new_page.public ? new_page.name : "private/" + new_page.name
|
||||
);
|
||||
frappe.set_route(route);
|
||||
});
|
||||
});
|
||||
|
|
@ -758,13 +759,9 @@ frappe.views.Workspace = class Workspace {
|
|||
indicator: "green",
|
||||
});
|
||||
if (page.public) {
|
||||
frappe.set_route("desk", frappe.router.slug(page.title));
|
||||
frappe.set_route("desk", frappe.router.slug(page.name));
|
||||
} else {
|
||||
frappe.set_route(
|
||||
"desk",
|
||||
"private",
|
||||
frappe.router.slug(page.title)
|
||||
);
|
||||
frappe.set_route("desk", "private", frappe.router.slug(page.name));
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue