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

Web: Properly load shared menu items 

refs #5600
This commit is contained in:
Johannes Meyer 2015-09-17 13:40:40 +02:00
parent 83bde3aa81
commit 0ec3610349
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/Application/Web.php
View File

@ -182,7 +182,6 @@ class Web extends EmbeddedWeb
$config = Config::app('navigation')->getConfigObject(); $config = Config::app('navigation')->getConfigObject();
$config->setKeyColumn('name'); $config->setKeyColumn('name');
$navigation = new Navigation();
if ($type === 'dashboard-pane') { if ($type === 'dashboard-pane') {
$panes = array(); $panes = array();
foreach ($config->select()->where('type', 'dashlet') as $dashletName => $dashletConfig) { foreach ($config->select()->where('type', 'dashlet') as $dashletName => $dashletConfig) {
@ -192,6 +191,7 @@ class Web extends EmbeddedWeb
} }
} }
$navigation = new Navigation();
foreach ($panes as $paneName => $dashlets) { foreach ($panes as $paneName => $dashlets) {
$navigation->addItem( $navigation->addItem(
$paneName, $paneName,
@ -202,11 +202,14 @@ class Web extends EmbeddedWeb
); );
} }
} else { } else {
$items = array();
foreach ($config->select()->where('type', $type) as $name => $typeConfig) { foreach ($config->select()->where('type', $type) as $name => $typeConfig) {
if ($this->hasAccessToSharedNavigationItem($typeConfig)) { if ($this->hasAccessToSharedNavigationItem($typeConfig)) {
$navigation->addItem($name, $typeConfig->toArray()); $items[$name] = $typeConfig;
} }
} }
$navigation = Navigation::fromConfig($items);
} }
return $navigation; return $navigation;