User: Drop method loadNavigationConfig()

refs #10246
Icinga · Sep 30, 2015 · 037fee2 · 037fee2
1 parent befbc6c
commit 037fee2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 23 deletions.
diff --git a/application/forms/Navigation/NavigationConfigForm.php b/application/forms/Navigation/NavigationConfigForm.php
@@ -401,8 +401,7 @@ public function edit($name, array $data)
                         if ($ownerName === $this->getUser()->getUsername()) {
                             $exists = $this->getUserConfig()->hasSection($name);
                         } else {
-                            $owner = new User($ownerName);
-                            $exists = $owner->loadNavigationConfig()->hasSection($name);
+                            $exists = Config::navigation($itemConfig->type, $ownerName)->hasSection($name);
                         }
                     } else {
                         $exists = (bool) $this->getShareConfig()
@@ -537,8 +536,7 @@ public function unshare($name, $parent = null)
         if (! $itemConfig->owner || $itemConfig->owner === $this->getUser()->getUsername()) {
             $config = $this->getUserConfig();
         } else {
-            $owner = new User($itemConfig->owner);
-            $config = $owner->loadNavigationConfig();
+            $config = Config::navigation($itemConfig->type, $itemConfig->owner);
         }
 
         foreach ($children as $child) {

diff --git a/library/Icinga/User.php b/library/Icinga/User.php
@@ -479,22 +479,6 @@ public function can($requiredPermission)
         return false;
     }
 
-    /**
-     * Load and return this user's navigation configuration
-     *
-     * @return  Config
-     */
-    public function loadNavigationConfig()
-    {
-        return Config::fromIni(
-            Config::resolvePath('preferences')
-            . DIRECTORY_SEPARATOR
-            . $this->getUsername()
-            . DIRECTORY_SEPARATOR
-            . 'navigation.ini'
-        );
-    }
-
     /**
      * Load and return this user's configured navigation of the given type
      *
@@ -504,12 +488,12 @@ public function loadNavigationConfig()
      */
     public function getNavigation($type)
     {
-        $config = $this->loadNavigationConfig();
+        $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) {
                 // TODO: Throw ConfigurationError if pane or url is missing
                 $panes[$dashletConfig->pane][$dashletName] = $dashletConfig->url;
             }
@@ -525,7 +509,7 @@ public function getNavigation($type)
                 );
             }
         } else {
-            $navigation = Navigation::fromConfig($config->select()->where('type', $type));
+            $navigation = Navigation::fromConfig($config);
         }
 
         return $navigation;