NavigationController: Redirect to the shared overview if its the refe…

…rrer.. ..when editing a navigation item. refs #5600
Icinga · Sep 23, 2015 · 4d303e7 · 4d303e7
1 parent 6aecfe6
commit 4d303e7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/application/controllers/NavigationController.php b/application/controllers/NavigationController.php
@@ -188,9 +188,10 @@ public function addAction()
     public function editAction()
     {
         $itemName = $this->params->getRequired('name');
+        $referrer = $this->params->get('referrer', 'index');
 
         $form = new NavigationConfigForm();
-        $form->setRedirectUrl('navigation');
+        $form->setRedirectUrl($referrer === 'shared' ? 'navigation/shared' : 'navigation');
         $form->setItemTypes($this->listItemTypes());
         $form->setTitle(sprintf($this->translate('Edit Navigation Item %s'), $itemName));
         $form->setUser($this->Auth()->getUser());

diff --git a/application/views/scripts/navigation/shared.phtml b/application/views/scripts/navigation/shared.phtml
@@ -24,7 +24,10 @@
                 <td><?= $this->qlink(
                     $name,
                     'navigation/edit',
-                    array('name' => $name),
+                    array(
+                        'name'      => $name,
+                        'referrer'  => 'shared'
+                    ),
                     array(
                         'title' => sprintf($this->translate('Edit shared navigation item %s'), $name)
                     )