From 6573dc5eca8704b7f9aaebaf73ef213259d3d007 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Fri, 8 Oct 2021 17:03:06 +0200 Subject: [PATCH] loader.js: Don't load a redirect in col1, if col2 has similar content fixes Icinga/icingadb-web#284 (cherry picked from commit 18188f71858457e81e32845ab507a09db17af5ff) --- public/js/icinga/loader.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js index dae0f5aaa..e009feab9 100644 --- a/public/js/icinga/loader.js +++ b/public/js/icinga/loader.js @@ -643,7 +643,9 @@ this.loadUrl(parts.shift(), $('#col2')); } else { if ($target.attr('id') === 'col2') { // TODO: multicol - if ($('#col1').data('icingaUrl').split('?')[0] === url.split('?')[0]) { + if ($target.data('icingaUrl').split('?')[0] === url.split('?')[0]) { + // Don't do anything in this case + } else if ($('#col1').data('icingaUrl').split('?')[0] === url.split('?')[0]) { icinga.ui.layout1col(); $target = $('#col1'); delete(this.requests['col2']);