From 967c3552e503168c683ae0ca94d3eec267ce5f7b Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Fri, 2 Oct 2015 11:35:46 +0200 Subject: [PATCH] Revert "Fix logout loop (testing), #2" This reverts commit 6affad689523b2abb78f4fddcaff31e219214bc4. --- application/forms/Authentication/LoginForm.php | 2 +- public/js/icinga/loader.js | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/application/forms/Authentication/LoginForm.php b/application/forms/Authentication/LoginForm.php index bb01f8a04..72dea3399 100644 --- a/application/forms/Authentication/LoginForm.php +++ b/application/forms/Authentication/LoginForm.php @@ -71,7 +71,7 @@ class LoginForm extends Form if ($this->created) { $redirect = $this->getElement('redirect')->getValue(); } - if (empty($redirect) || strpos($redirect, 'authentication/logout') !== 0) { + if (empty($redirect)) { $redirect = static::REDIRECT_URL; } return Url::fromPath($redirect); diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js index 5ad87cae5..dfdf1d25d 100644 --- a/public/js/icinga/loader.js +++ b/public/js/icinga/loader.js @@ -359,7 +359,7 @@ url = parts.shift(); var redirectionUrl = this.addUrlFlag(url, 'renderLayout'); var r = this.loadUrl(redirectionUrl, $('#layout')); - r.historyUrl = url; + r.addToHistory = false; if (parts.length) { r.loadNext = parts; } else if (!! document.location.hash) { @@ -613,8 +613,7 @@ } else { // Request wasn't for a container, so it's usually the body // or the full layout. Push request URL to history: - var url = typeof req.historyUrl !== 'undefined' ? req.historyUrl : req.url; - this.icinga.history.pushUrl(url); + this.icinga.history.pushUrl(req.url); } }