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

User: Properly load menu items 

refs #5600
This commit is contained in:
Johannes Meyer 2015-09-17 13:40:58 +02:00
parent 0ec3610349
commit bb4f4e9095
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/Icinga/User.php
View File

@ -507,7 +507,6 @@ class User
$config = $this->loadNavigationConfig(); $config = $this->loadNavigationConfig();
$config->getConfigObject()->setKeyColumn('name'); $config->getConfigObject()->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) {
@ -515,6 +514,7 @@ class User
$panes[$dashletConfig->pane][$dashletName] = $dashletConfig->url; $panes[$dashletConfig->pane][$dashletName] = $dashletConfig->url;
} }
$navigation = new Navigation();
foreach ($panes as $paneName => $dashlets) { foreach ($panes as $paneName => $dashlets) {
$navigation->addItem( $navigation->addItem(
$paneName, $paneName,
@ -525,9 +525,7 @@ class User
); );
} }
} else { } else {
foreach ($config->select()->where('type', $type) as $name => $typeConfig) { $navigation = Navigation::fromConfig($config->select()->where('type', $type));
$navigation->addItem($name, $typeConfig->toArray());
}
} }
return $navigation; return $navigation;