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

NavigationController: Rerender the layout when removing menu entries 

refs #5600
This commit is contained in:
Johannes Meyer 2015-09-25 10:51:44 +02:00
parent 2952eaefcd
commit 086579b254
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/controllers/NavigationController.php
View File

@ -257,7 +257,7 @@ class NavigationController extends Controller
$form->setTitle(sprintf($this->translate('Remove Navigation Item %s'), $itemName));
$form->setOnSuccess(function (ConfirmRemovalForm $form) use ($itemName, $navigationConfigForm) {
try {
$navigationConfigForm->delete($itemName);
$itemConfig = $navigationConfigForm->delete($itemName);
} catch (NotFoundError $e) {
Notification::success(sprintf(t('Navigation Item "%s" not found. No action required'), $itemName));
return true;
@ -267,6 +267,10 @@ class NavigationController extends Controller
}
if ($navigationConfigForm->save()) {
if ($itemConfig->type === 'menu-item') {
$form->getResponse()->setRerenderLayout();
}
Notification::success(sprintf(t('Navigation Item "%s" successfully removed'), $itemName));
return true;
}

6
application/forms/Navigation/NavigationConfigForm.php
View File

@ -8,6 +8,7 @@ use Icinga\Application\Config;
use Icinga\Application\Logger;
use Icinga\Application\Icinga;
use Icinga\Authentication\Auth;
use Icinga\Data\ConfigObject;
use Icinga\Exception\IcingaException;
use Icinga\Exception\NotFoundError;
use Icinga\Exception\ProgrammingError;
@ -449,7 +450,7 @@ class NavigationConfigForm extends ConfigForm
*
* @param string $name
*
* @return $this
* @return ConfigObject The navigation item's config
*
* @throws NotFoundError In case no navigation item with the given name is found
* @throws IcingaException In case the navigation item has still children
@ -473,9 +474,10 @@ class NavigationConfigForm extends ConfigForm
);
}
$section = $config->getSection($name);
$config->removeSection($name);
$this->setIniConfig($config);
return $this;
return $section;
}
/**