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

Routing fix for special characters

Browse source
This commit is contained in:
Faris Ansari 2018-01-10 15:11:08 +05:30
parent 4700782c0b
commit aa4e293d3b
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
frappe/public/js/frappe/list/list_view.js
View file

@ -508,7 +508,11 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
}
get_form_link(doc) {
return '#Form/' + this.doctype + '/' + doc.name;
const docname = doc.name.match(/[%'"]/)
? encodeURIComponent(doc.name)
: doc.name;
return '#Form/' + this.doctype + '/' + docname;
}
get_subject_html(doc) {

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

@ -67,10 +67,10 @@ frappe.route = function() {
frappe.get_route = function(route) {
// for app
var route = frappe.get_raw_route_str(route).split('/');
route = frappe.get_raw_route_str(route).split('/');
route = $.map(route, frappe._decode_str);
var parts = route[route.length - 1].split("?");
route[route.length - 1] = frappe._decode_str(parts[0]);
route[route.length - 1] = parts[0];
if (parts.length > 1) {
var query_params = get_query_params(parts[1]);
frappe.route_options = $.extend(frappe.route_options || {}, query_params);
@ -133,8 +133,11 @@ frappe.set_route = function() {
frappe.route_options = a;
return null;
} else {
if (a.match(/[%'"]/)) {
// if special chars, then encode
a = encodeURIComponent(a);
}
return a;
// return a ? encodeURIComponent(a) : null;
}
}).join('/');