From f12a5741b8a4c53b7e5d94e43094e18d5a946934 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Tue, 2 Sep 2014 19:05:49 +0200
Subject: [PATCH] js/loader: postpone redirection handling

Redirections should not be executed unless the original request has been
terminated and removed from pending requests.

fixes #6989
---
 public/js/icinga/loader.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index f91aa20b9..a80fb28d1 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -329,8 +329,7 @@
                 this.icinga.ui.reloadCss();
             }
 
-            var redirect = req.getResponseHeader('X-Icinga-Redirect');
-            if (this.processRedirectHeader(req)) return;
+            if (req.getResponseHeader('X-Icinga-Redirect')) return;
 
             // div helps getting an XML tree
             var $resp = $('<div>' + req.responseText + '</div>');
@@ -567,6 +566,7 @@
             delete this.requests[req.$target.attr('id')];
             this.icinga.ui.fadeNotificationsAway();
 
+            this.processRedirectHeader(req);
 
             if (typeof req.loadNext !== 'undefined') {
                 if ($('#col2').length) {