fix(routing): docname for names including /
This commit is contained in:
parent
c8f5995566
commit
c7cb09bec9
1 changed files with 20 additions and 10 deletions
|
|
@ -128,17 +128,13 @@ frappe.router = {
|
|||
// doctype route
|
||||
if (route[1]) {
|
||||
if (route[2] && route[1]==='view') {
|
||||
if (route[2].toLowerCase()==='tree') {
|
||||
standard_route = ['Tree', doctype_route.doctype];
|
||||
} else {
|
||||
standard_route = ['List', doctype_route.doctype, frappe.utils.to_title_case(route[2])];
|
||||
if (route[3]) {
|
||||
// calendar / kanban / dashboard name
|
||||
standard_route.push(route[3]);
|
||||
}
|
||||
}
|
||||
standard_route = this.get_standard_route_for_list(route);
|
||||
} else {
|
||||
standard_route = ['Form', doctype_route.doctype, route[1]];
|
||||
let docname = route[1];
|
||||
if (route.length > 2) {
|
||||
docname = route.slice(1).join('/');
|
||||
}
|
||||
standard_route = ['Form', doctype_route.doctype, docname];
|
||||
}
|
||||
} else if (frappe.model.is_single(doctype_route.doctype)) {
|
||||
standard_route = ['Form', doctype_route.doctype, doctype_route.doctype];
|
||||
|
|
@ -155,6 +151,20 @@ frappe.router = {
|
|||
return standard_route;
|
||||
},
|
||||
|
||||
get_standard_route_for_list(route) {
|
||||
let standard_route;
|
||||
if (route[2].toLowerCase()==='tree') {
|
||||
standard_route = ['Tree', doctype_route.doctype];
|
||||
} else {
|
||||
standard_route = ['List', doctype_route.doctype, frappe.utils.to_title_case(route[2])];
|
||||
if (route[3]) {
|
||||
// calendar / kanban / dashboard name
|
||||
standard_route.push(route[3]);
|
||||
}
|
||||
}
|
||||
return standard_route;
|
||||
},
|
||||
|
||||
set_history(sub_path) {
|
||||
frappe.route_history.push(this.current_route);
|
||||
frappe.route_titles[sub_path] = frappe._original_title || document.title;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue