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

Fix layout re-rendering after login (thank you, automerge)

Browse Source
This commit is contained in:
Thomas Gelf 2014-03-06 11:07:24 +00:00
parent 864dc15514
commit 95189fbf46
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/controllers/AuthenticationController.php
View File

@ -39,6 +39,7 @@ use Icinga\Logger\Logger;
use Icinga\Exception\NotReadableError; use Icinga\Exception\NotReadableError;
use Icinga\Exception\ConfigurationError; use Icinga\Exception\ConfigurationError;
use Icinga\User; use Icinga\User;
use Icinga\Web\Url;
/** /**
* Application wide controller for authentication * Application wide controller for authentication
@ -61,7 +62,10 @@ class AuthenticationController extends ActionController
$this->view->form->setRequest($this->_request); $this->view->form->setRequest($this->_request);
$this->view->title = 'Icinga Web Login'; $this->view->title = 'Icinga Web Login';
try { try {
$redirectUrl = $this->_request->getParam('redirect', 'index?_render=body'); $redirectUrl = Url::fromPath($this->_request->getParam('redirect', 'dashboard'));
if ($this->_request->isXmlHttpRequest()) {
$redirectUrl->setParam('_render', 'layout');
}
$auth = AuthManager::getInstance(); $auth = AuthManager::getInstance();
if ($auth->isAuthenticated()) { if ($auth->isAuthenticated()) {
$this->redirectNow($redirectUrl); $this->redirectNow($redirectUrl);