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

Revert "Revert "Fix logout loop (testing), #2"" 

This reverts commit 967c3552e5.
This commit is contained in:
Johannes Meyer 2015-10-02 11:45:42 +02:00
parent 8a1f6059d8
commit 8e94f3e58e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/forms/Authentication/LoginForm.php
View File

@ -71,7 +71,7 @@ class LoginForm extends Form
if ($this->created) { if ($this->created) {
$redirect = $this->getElement('redirect')->getValue(); $redirect = $this->getElement('redirect')->getValue();
} }
if (empty($redirect)) { if (empty($redirect) || strpos($redirect, 'authentication/logout') !== 0) {
$redirect = static::REDIRECT_URL; $redirect = static::REDIRECT_URL;
} }
return Url::fromPath($redirect); return Url::fromPath($redirect);

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.addToHistory = false; r.historyUrl = url;
if (parts.length) { if (parts.length) {
r.loadNext = parts; r.loadNext = parts;
} else if (!! document.location.hash) { } else if (!! document.location.hash) {
@ -613,7 +613,8 @@
} else { } else {
// Request wasn't for a container, so it's usually the body // Request wasn't for a container, so it's usually the body
// or the full layout. Push request URL to history: // or the full layout. Push request URL to history:
this.icinga.history.pushUrl(req.url); var url = typeof req.historyUrl !== 'undefined' ? req.historyUrl : req.url;
this.icinga.history.pushUrl(url);
} }
} }