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

NavigationConfigForm: Provide proper parents when editing a shared item

Browse Source 
refs #5600
This commit is contained in:
Johannes Meyer 2015-09-18 10:40:16 +02:00
parent 91601de398
commit 4b7fbdfa1f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -186,7 +186,11 @@ class NavigationConfigForm extends ConfigForm
public function listAvailableParents($type) public function listAvailableParents($type)
{ {
$shared = false; $shared = false;
if (($checkbox = $this->getElement('shared')) !== null) { $children = array();
if ($this->itemToLoad) {
$shared = $this->hasBeenShared($this->itemToLoad);
$children = $this->getFlattenedChildren($this->itemToLoad);
} elseif (($checkbox = $this->getElement('shared')) !== null) {
if ($checkbox->isChecked()) { if ($checkbox->isChecked()) {
$shared = true; $shared = true;
} else { } else {
@ -195,8 +199,6 @@ class NavigationConfigForm extends ConfigForm
} }
} }
$children = $this->itemToLoad ? $this->getFlattenedChildren($this->itemToLoad) : array();
$names = array(); $names = array();
if ($shared) { if ($shared) {
foreach ($this->getShareConfig() as $sectionName => $sectionConfig) { foreach ($this->getShareConfig() as $sectionName => $sectionConfig) {