From e99cdb66ef31bfdeddaf651b701ad9f3cc28fe69 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 2 Oct 2015 11:35:29 +0200
Subject: [PATCH] loader.js: Do not push redirects to history

---
 public/js/icinga/loader.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 36f6805ba..5ad87cae5 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -571,6 +571,11 @@
          * Regardless of whether a request succeeded of failed, clean up
          */
         onComplete: function (req, textStatus) {
+            if (this.processRedirectHeader(req)) {
+                delete this.requests[req.$target.attr('id')];
+                return;
+            }
+
             // Remove 'impact' class if there was such
             if (req.$target.hasClass('impact')) {
                 req.$target.removeClass('impact');
@@ -617,8 +622,6 @@
             delete this.requests[req.$target.attr('id')];
             this.icinga.ui.fadeNotificationsAway();
 
-            this.processRedirectHeader(req);
-
             if (typeof req.loadNext !== 'undefined' && req.loadNext.length) {
                 if ($('#col2').length) {
                     var r = this.loadUrl(req.loadNext[0], $('#col2'));
@@ -646,7 +649,6 @@
             if (req.addToHistory && ! req.autorefresh) {
                 req.$target.data('icingaRefresh', 0);
                 req.$target.data('icingaUrl', url);
-                icinga.history.pushCurrentState();
             }
 
             if (typeof req.progressTimer !== 'undefined') {