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

NavigationItem: Accept priority while merging if none is set yet

This commit is contained in:
Johannes Meyer 2015-10-01 16:32:47 +02:00
parent 57f30b1f92
commit d54e5f62e6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/Icinga/Web/Navigation/NavigationItem.php
View File

@ -131,7 +131,6 @@ class NavigationItem implements IteratorAggregate
public function __construct($name, array $properties = null) public function __construct($name, array $properties = null)
{ {
$this->setName($name); $this->setName($name);
$this->priority = 100;
$this->children = new Navigation(); $this->children = new Navigation();
if (! empty($properties)) { if (! empty($properties)) {
@ -207,7 +206,7 @@ class NavigationItem implements IteratorAggregate
*/ */
public function getPriority() public function getPriority()
{ {
return $this->priority; return $this->priority !== null ? $this->priority : 100;
} }
/** /**
@ -597,6 +596,10 @@ class NavigationItem implements IteratorAggregate
throw new ProgrammingError('Cannot merge, conflict detected.'); throw new ProgrammingError('Cannot merge, conflict detected.');
} }
if ($this->priority === null && ($priority = $item->getPriority()) !== null) {
$this->setPriority($priority);
}
if ($item->getActive()) { if ($item->getActive()) {
$this->setActive(); $this->setActive();
} }