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

Fix logout loop (testing)

Browse Source 
If this commit breaks anyhting, feel free to revert it.
This commit is contained in:
Eric Lippmann 2015-10-01 10:30:18 +02:00
parent 5b71d0b834
commit 5f7f0a9e89
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -359,7 +359,7 @@
url = parts.shift(); url = parts.shift();
var redirectionUrl = this.addUrlFlag(url, 'renderLayout'); var redirectionUrl = this.addUrlFlag(url, 'renderLayout');
var r = this.loadUrl(redirectionUrl, $('#layout')); var r = this.loadUrl(redirectionUrl, $('#layout'));
r.url = url; r.addToHistory = false;
if (parts.length) { if (parts.length) {
r.loadNext = parts; r.loadNext = parts;
} else if (!! document.location.hash) { } else if (!! document.location.hash) {
@ -620,7 +620,8 @@
if (typeof req.loadNext !== 'undefined' && req.loadNext.length) { if (typeof req.loadNext !== 'undefined' && req.loadNext.length) {
if ($('#col2').length) { if ($('#col2').length) {
this.loadUrl(req.loadNext[0], $('#col2')); var r = this.loadUrl(req.loadNext[0], $('#col2'));
r.addToHistory = req.addToHistory;
this.icinga.ui.layout2col(); this.icinga.ui.layout2col();
} else { } else {
this.icinga.logger.error('Failed to load URL for #col2', req.loadNext); this.icinga.logger.error('Failed to load URL for #col2', req.loadNext);