From 4ebfbf83abfe7875f2537b69863d2b3a5a065117 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Wed, 11 Mar 2015 21:40:14 +0100 Subject: [PATCH] Leave note about __SELF__ in our action controller refs #8626 --- library/Icinga/Web/Controller/ActionController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php index 0a1fe8ae4..d1c320bb2 100644 --- a/library/Icinga/Web/Controller/ActionController.php +++ b/library/Icinga/Web/Controller/ActionController.php @@ -307,6 +307,8 @@ class ActionController extends Zend_Controller_Action $afterLogin = Url::fromPath($afterLogin); } if ($this->isXhr()) { + // __SELF__ instructs JavaScript to redirect to the current window's URL in case it's an auto-refreshing + // request or to redirect to the URL which required login in case it's not an auto-refreshing one $redir = '__SELF__'; } else { // TODO: Ignore /? @@ -319,7 +321,6 @@ class ActionController extends Zend_Controller_Action if ($redir) { $url->setParam('redirect', $redir); } - $this->rerenderLayout()->redirectNow($url); }