Web: Load the new config files for shared items

refs #10246
Icinga · Sep 30, 2015 · 633dca6 · 633dca6
1 parent 037fee2
commit 633dca6
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
@@ -179,12 +179,12 @@ private function hasAccessToSharedNavigationItem(& $config)
      */
     public function getSharedNavigation($type)
     {
-        $config = Config::app('navigation')->getConfigObject();
-        $config->setKeyColumn('name');
+        $config = Config::navigation($type === 'dashboard-pane' ? 'dashlet' : $type);
+        $config->getConfigObject()->setKeyColumn('name');
 
         if ($type === 'dashboard-pane') {
             $panes = array();
-            foreach ($config->select()->where('type', 'dashlet') as $dashletName => $dashletConfig) {
+            foreach ($config as $dashletName => $dashletConfig) {
                 if ($this->hasAccessToSharedNavigationItem($dashletConfig)) {
                     // TODO: Throw ConfigurationError if pane or url is missing
                     $panes[$dashletConfig->pane][$dashletName] = $dashletConfig->url;
@@ -203,7 +203,7 @@ public function getSharedNavigation($type)
             }
         } else {
             $items = array();
-            foreach ($config->select()->where('type', $type) as $name => $typeConfig) {
+            foreach ($config as $name => $typeConfig) {
                 if ($this->hasAccessToSharedNavigationItem($typeConfig)) {
                     $items[$name] = $typeConfig;
                 }