Web: Properly load shared menu items

refs #5600
Icinga · Sep 17, 2015 · 0ec3610 · 0ec3610
1 parent 83bde3a
commit 0ec3610
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
@@ -182,7 +182,6 @@ public function getSharedNavigation($type)
         $config = Config::app('navigation')->getConfigObject();
         $config->setKeyColumn('name');
 
-        $navigation = new Navigation();
         if ($type === 'dashboard-pane') {
             $panes = array();
             foreach ($config->select()->where('type', 'dashlet') as $dashletName => $dashletConfig) {
@@ -192,6 +191,7 @@ public function getSharedNavigation($type)
                 }
             }
 
+            $navigation = new Navigation();
             foreach ($panes as $paneName => $dashlets) {
                 $navigation->addItem(
                     $paneName,
@@ -202,11 +202,14 @@ public function getSharedNavigation($type)
                 );
             }
         } else {
+            $items = array();
             foreach ($config->select()->where('type', $type) as $name => $typeConfig) {
                 if ($this->hasAccessToSharedNavigationItem($typeConfig)) {
-                    $navigation->addItem($name, $typeConfig->toArray());
+                    $items[$name] = $typeConfig;
                 }
             }
+
+            $navigation = Navigation::fromConfig($items);
         }
 
         return $navigation;