tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

js: Also adjust `utils.removeUrlParams()`.. 

..and properly handle flags in `utils.addUrlParams()`

refs #4056
This commit is contained in:
Johannes Meyer 2020-01-16 08:11:19 +01:00
parent 7192d5fd6c
commit 477649900c
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
public/js/icinga/utils.js
View File

@ -132,21 +132,23 @@
newparams = parts.params;
$.each(params, function (key, value) {
// We overwrite existing params
newparams[encodeURIComponent(key)] = encodeURIComponent(value);
// We overwrite existing params
newparams[encodeURIComponent(key)] = typeof value === 'string'
? encodeURIComponent(value)
: null;
});
if (Object.keys(newparams).length) {
var queryString = '?';
$.each(newparams, function (key, value) {
if (queryString !== '?') {
queryString += '&';
}
if (queryString !== '?') {
queryString += '&';
}
queryString += key;
if (value !== null) {
queryString += '=' + value;
}
queryString += key;
if (value !== null) {
queryString += '=' + value;
}
});
result += queryString;
}
@ -165,7 +167,7 @@
newparams = parts.params;
$.each(params, function (idx, key) {
delete newparams[key];
delete newparams[encodeURIComponent(key)];
});
if (Object.keys(newparams).length) {
@ -175,9 +177,9 @@
queryString += '&';
}
queryString += encodeURIComponent(key);
queryString += key;
if (value !== null) {
queryString += '=' + encodeURIComponent(value);
queryString += '=' + value;
}
});
result += queryString;