tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-26 07:14:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

loader.js: Do not push redirects to history

Browse Source
This commit is contained in:
Johannes Meyer 2015-10-02 11:35:29 +02:00
parent 7e2c47e26b
commit e99cdb66ef
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -571,6 +571,11 @@
* Regardless of whether a request succeeded of failed, clean up * Regardless of whether a request succeeded of failed, clean up
*/ */
onComplete: function (req, textStatus) { onComplete: function (req, textStatus) {
if (this.processRedirectHeader(req)) {
delete this.requests[req.$target.attr('id')];
return;
}
// Remove 'impact' class if there was such // Remove 'impact' class if there was such
if (req.$target.hasClass('impact')) { if (req.$target.hasClass('impact')) {
req.$target.removeClass('impact'); req.$target.removeClass('impact');
@ -617,8 +622,6 @@
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' && req.loadNext.length) { if (typeof req.loadNext !== 'undefined' && req.loadNext.length) {
if ($('#col2').length) { if ($('#col2').length) {
var r = this.loadUrl(req.loadNext[0], $('#col2')); var r = this.loadUrl(req.loadNext[0], $('#col2'));
@ -646,7 +649,6 @@
if (req.addToHistory && ! req.autorefresh) { if (req.addToHistory && ! req.autorefresh) {
req.$target.data('icingaRefresh', 0); req.$target.data('icingaRefresh', 0);
req.$target.data('icingaUrl', url); req.$target.data('icingaUrl', url);
icinga.history.pushCurrentState();
} }
if (typeof req.progressTimer !== 'undefined') { if (typeof req.progressTimer !== 'undefined') {