[checkmk-commits] Check_MK Git: check_mk: * FIX: Removed duplicate url parameters e.g. in dashboard (display_options)

Module: check_mk Branch: master Commit: 6c01c85a781f04d2b8df9b90ca4f9c18a0fdf7ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c01c85a781f04… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Wed Sep 19 15:48:16 2012 +0200 * FIX: Removed duplicate url parameters e.g. in dashboard (display_options) * FIX: Dashboard: If original request showed no "max rows"-message, the page rendered during reload does not show the message anymore --- ChangeLog | 3 +++ web/htdocs/js/checkmk.js | 15 +++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6fa173f..53126f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -124,6 +124,9 @@ * FIX: fixed layout of login dialog when showing up error messages * FIX: Fixed styling of wato quickaccess snapin preview * FIX: Made printer_supply perfometer a bit more robust against bad perfdata + * FIX: Removed duplicate url parameters e.g. in dashboard (display_options) + * FIX: Dashboard: If original request showed no "max rows"-message, the + page rendered during reload does not show the message anymore Livecheck: * FIX: Compile livecheck also if diet libc is missing diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 83bb22f..dd43ee0 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -270,7 +270,9 @@ function makeuri(addvars) { // Skip unwanted parmas for(var i = 0; i < tmp.length; i++) { pair = tmp[i].split('='); - if(pair[0][0] == '_') + if(pair[0][0] == '_') // Skip _<vars> + continue; + if(addvars.hasOwnProperty(pair[0])) // Skip vars present in addvars continue; params.push(tmp[i]); } @@ -758,7 +760,8 @@ function handleReload(url) { window.location.href = url; } else { - // Enforce specific display_options to get only the content data + // Enforce specific display_options to get only the content data. + // All options in "opts" will be forced. Existing upper-case options will be switched. var display_options = getUrlParam('display_options'); // Removed 'w' to reflect original rengering mechanism during reload // For example show the "Your query produced more than 1000 results." message @@ -772,6 +775,14 @@ function handleReload(url) { } opts = null; + // Add optional display_options if not defined in original display_options + var opts = [ 'w' ]; + for (var i = 0; i < opts.length; i++) { + if (display_options.indexOf(opts[i].toUpperCase()) == -1) + display_options += opts[i]; + } + opts = null; + var params = {'_display_options': display_options}; var real_display_options = getUrlParam('display_options'); if(real_display_options !== '')