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

loader.js: Don't refresh twice upon __CLOSE__ (#5106)

Browse Source
This commit is contained in:
Johannes Meyer 2023-09-07 12:50:13 +02:00 committed by GitHub
commit cdfe7e9aba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -492,6 +492,7 @@
*/ */
processRedirectHeader: function(req) { processRedirectHeader: function(req) {
var icinga = this.icinga, var icinga = this.icinga,
$redirectTarget = req.$redirectTarget,
redirect = req.getResponseHeader('X-Icinga-Redirect'); redirect = req.getResponseHeader('X-Icinga-Redirect');
if (! redirect) { if (! redirect) {
@ -594,27 +595,8 @@
return true; return true;
} }
// Refresh left column and produce a new history state for it $redirectTarget = $('#col1');
let $refreshTarget = $('#col1'); redirect = icinga.history.getCol1State();
let refreshUrl = icinga.history.getCol1State();
let refresh = this.loadUrl(refreshUrl, $refreshTarget);
refresh.addToHistory = true;
refresh.scripted = true;
var _this = this;
setTimeout(function () {
// TODO: Find a better solution than a hardcoded one
// This is still the *cheat* to get live results
// (in case there's a delay and a change is not instantly effective)
var secondRefresh = _this.loadUrl(refreshUrl, $refreshTarget);
if (secondRefresh !== refresh) {
// Only change these properties if it's not still the first refresh
secondRefresh.addToHistory = false;
secondRefresh.scripted = true;
}
}, 1000);
return true;
} }
var useHttp = req.getResponseHeader('X-Icinga-Redirect-Http'); var useHttp = req.getResponseHeader('X-Icinga-Redirect-Http');
@ -623,7 +605,7 @@
return true; return true;
} }
this.redirectToUrl(redirect, req.$redirectTarget, req); this.redirectToUrl(redirect, $redirectTarget, req);
return true; return true;
}, },