From 590db51255501eaf04e98a4858c5df0fbd67bbff Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Mon, 30 Jun 2014 16:19:05 +0200 Subject: [PATCH] js/loader: handle form redirections automagically An XHR redirection in a right-side container pointing to the URL shown on the left should close it's own container and refresh the lefthand one. refs #6436 fixes #6435 --- public/js/icinga/loader.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js index 0c729cd72..584087b22 100644 --- a/public/js/icinga/loader.js +++ b/public/js/icinga/loader.js @@ -244,9 +244,10 @@ }, processRedirectHeader: function(req) { + var icinga = this.icinga; var redirect = req.getResponseHeader('X-Icinga-Redirect'); if (! redirect) return false; - this.icinga.logger.debug( + icinga.logger.debug( 'Got redirect for ', req.$target, ', URL was ' + redirect ); redirect = decodeURIComponent(redirect); @@ -255,6 +256,13 @@ var redirectionUrl = this.addUrlFlag(redirect, 'renderLayout'); this.loadUrl(redirectionUrl, $('#layout')).url = redirect; } else { + if (req.$target.attr('id') === 'col2') { // TODO: multicol + if ($('#col1').data('icingaUrl') === redirect) { + icinga.ui.layout1col(); + req.$target = $('#col1'); + } + } + this.loadUrl(redirect, req.$target); } return true;