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

Revert "loader.js: Do not push redirects to history" 

This reverts commit e99cdb66ef.
This commit is contained in:
Johannes Meyer 2015-10-02 11:45:55 +02:00
parent 8e94f3e58e
commit 68297f0630
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -571,11 +571,6 @@
* 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');
@ -622,6 +617,8 @@
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'));
@ -649,6 +646,7 @@
if (req.addToHistory && ! req.autorefresh) {
req.$target.data('icingaRefresh', 0);
req.$target.data('icingaUrl', url);
icinga.history.pushCurrentState();
}
if (typeof req.progressTimer !== 'undefined') {