tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Failure requests: Fix auto refresh and history II 

Allow to change url's in history and stop auto auto refresh if
the container URL is not up to date.

Use variable after ajax call and the check is more robust.
This commit is contained in:
Johannes Meyer 2015-02-02 16:34:29 +01:00 committed by Marius Hein
parent bc69a3b20f
commit 8bb0e4e0a0
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
public/js/icinga/loader.js
View File

@ -118,6 +118,8 @@
req.historyTriggered = false;
req.autorefresh = autorefresh;
req.action = action;
req.failure = false;
if (id) {
this.requests[id] = req;
}
@ -555,7 +557,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')) {
if (req.$target.hasClass('container') && ! req.failure) {
// We only want to care about top-level containers
if (req.$target.parent().closest('.container').length === 0) {
this.icinga.history.pushCurrentState();
@ -591,6 +593,17 @@
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,