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

js/loader: postpone redirection handling 

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

fixes #6989
This commit is contained in:
Thomas Gelf 2014-09-02 19:05:49 +02:00
parent 1734f01040
commit f12a5741b8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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