From bc69a3b20f9fb254a55ee8ae2956e02ef7b73e02 Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Mon, 2 Feb 2015 16:40:05 +0100 Subject: [PATCH] Revert "Failure requests: Fix auto refresh and history" This reverts commit 8c758a9f126f81cc50fe290691d284947ec1804d. --- public/js/icinga/loader.js | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js index abf0d6684..6a85a5144 100644 --- a/public/js/icinga/loader.js +++ b/public/js/icinga/loader.js @@ -107,8 +107,7 @@ url : url, data : data, headers: headers, - context: self, - failure: false + context: self }); req.$target = $target; @@ -556,7 +555,7 @@ // Update history when necessary. Don't do so for requests triggered // by history or autorefresh events if (! req.historyTriggered && ! req.autorefresh) { - if (req.$target.hasClass('container') && req.failure === false) { + if (req.$target.hasClass('container')) { // We only want to care about top-level containers if (req.$target.parent().closest('.container').length === 0) { this.icinga.history.pushCurrentState(); @@ -592,17 +591,6 @@ onFailure: function (req, textStatus, errorThrown) { var url = req.url; - req.failure = true; - - /* - * Test if a manual actions comes in and autorefresh is active: Stop refreshing - */ - if (! req.historyTriggered && ! req.autorefresh && req.$target.data('icingaRefresh') > 0 - && req.$target.data('icingaUrl') !== url) { - req.$target.data('icingaRefresh', 0); - req.$target.data('icingaUrl', url); - } - if (req.status > 0) { this.icinga.logger.error( req.status,