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

NavigationConfigForm: Provide all available parents for non-shared items 

refs #5600
This commit is contained in:
Johannes Meyer 2015-09-18 11:01:02 +02:00
parent 9477c53b43
commit 335ed8c74f
1 changed files with 18 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -185,41 +185,27 @@ class NavigationConfigForm extends ConfigForm
*/
public function listAvailableParents($type)
{
$shared = false;
$children = array();
if ($this->itemToLoad) {
$shared = $this->hasBeenShared($this->itemToLoad);
$children = $this->getFlattenedChildren($this->itemToLoad);
} elseif (($checkbox = $this->getElement('shared')) !== null) {
if ($checkbox->isChecked()) {
$shared = true;
} else {
$requestData = $this->getRequestData();
$shared = isset($requestData['shared']) && $requestData['shared'];
$children = $this->itemToLoad ? $this->getFlattenedChildren($this->itemToLoad) : array();
$names = array();
foreach ($this->getShareConfig() as $sectionName => $sectionConfig) {
if (
$sectionName !== $this->itemToLoad
&& $sectionConfig->type === $type
&& $sectionConfig->owner === $this->getUser()->getUsername()
&& !in_array($sectionName, $children, true)
) {
$names[] = $sectionName;
}
}
$names = array();
if ($shared) {
foreach ($this->getShareConfig() as $sectionName => $sectionConfig) {
if (
$sectionName !== $this->itemToLoad
&& $sectionConfig->type === $type
&& $sectionConfig->owner === $this->getUser()->getUsername()
&& !in_array($sectionName, $children, true)
) {
$names[] = $sectionName;
}
}
} else {
foreach ($this->getUserConfig() as $sectionName => $sectionConfig) {
if (
$sectionName !== $this->itemToLoad
&& $sectionConfig->type === $type
&& !in_array($sectionName, $children, true)
) {
$names[] = $sectionName;
}
foreach ($this->getUserConfig() as $sectionName => $sectionConfig) {
if (
$sectionName !== $this->itemToLoad
&& $sectionConfig->type === $type
&& !in_array($sectionName, $children, true)
) {
$names[] = $sectionName;
}
}