tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-31 01:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

NavigationConfigForm: Automatically unshare childrens in method unshare()

Browse Source 
refs #5600
This commit is contained in:
Johannes Meyer 2015-09-18 15:57:45 +02:00
parent f4978fcb5a
commit 518cdad1a8
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -327,7 +327,7 @@ class NavigationConfigForm extends ConfigForm
: ((! isset($data['users']) || !$data['users']) && (! isset($data['groups']) || !$data['groups'])) : ((! isset($data['users']) || !$data['users']) && (! isset($data['groups']) || !$data['groups']))
) { ) {
// It is shared but shouldn't anymore // It is shared but shouldn't anymore
$config = $this->unshare($name)->config; // unshare() calls setIniConfig() $config = $this->unshare($name, isset($data['parent']) ? $data['parent'] : null)->config;
} }
} elseif ((isset($data['users']) && $data['users']) || (isset($data['groups']) && $data['groups'])) { } elseif ((isset($data['users']) && $data['users']) || (isset($data['groups']) && $data['groups'])) {
if ($this->getUser()->can('application/share/navigation')) { if ($this->getUser()->can('application/share/navigation')) {
@ -393,12 +393,14 @@ class NavigationConfigForm extends ConfigForm
* Unshare the given navigation item * Unshare the given navigation item
* *
* @param string $name * @param string $name
* @param string $parent
* *
* @return $this * @return $this
* *
* @throws NotFoundError In case no navigation item with the given name is found * @throws NotFoundError In case no navigation item with the given name is found
* @throws IcingaException In case the navigation item has a parent assigned to it
*/ */
public function unshare($name) public function unshare($name, $parent = null)
{ {
$config = $this->getShareConfig(); $config = $this->getShareConfig();
if (! $config->hasSection($name)) { if (! $config->hasSection($name)) {
@ -406,6 +408,20 @@ class NavigationConfigForm extends ConfigForm
} }
$itemConfig = $config->getSection($name); $itemConfig = $config->getSection($name);
if ($parent === null) {
$parent = $itemConfig->parent;
}
if ($parent && $this->hasBeenShared($parent)) {
throw new IcingaException(
'Unable to unshare navigation item "%s". It is dependent from item "%s".'
. ' Dependent items can only be unshared by unsharing their parent',
$name,
$parent
);
}
$children = $this->getFlattenedChildren($name);
$config->removeSection($name); $config->removeSection($name);
$this->secondaryConfig = $config; $this->secondaryConfig = $config;
@ -416,6 +432,13 @@ class NavigationConfigForm extends ConfigForm
$config = $owner->loadNavigationConfig(); $config = $owner->loadNavigationConfig();
} }
foreach ($children as $child) {
$childConfig = $this->secondaryConfig->getSection($child);
unset($childConfig->owner);
$this->secondaryConfig->removeSection($child);
$config->setSection($child, $childConfig);
}
unset($itemConfig->owner); unset($itemConfig->owner);
unset($itemConfig->users); unset($itemConfig->users);
unset($itemConfig->groups); unset($itemConfig->groups);