- $item): ?>
+
| qlink(
- $name,
+ $item->name,
'navigation/edit',
- array('name' => $name),
array(
- 'title' => sprintf($this->translate('Edit navigation item %s'), $name)
+ 'name' => $item->name,
+ 'type' => $item->type
+ ),
+ array(
+ 'title' => sprintf($this->translate('Edit navigation item %s'), $item->name)
)
); ?> |
type && isset($types[$item->type])
@@ -39,10 +42,13 @@
| qlink(
'',
'navigation/remove',
- array('name' => $name),
+ array(
+ 'name' => $item->name,
+ 'type' => $item->type
+ ),
array(
'icon' => 'trash',
- 'title' => sprintf($this->translate('Remove navigation item %s'), $name)
+ 'title' => sprintf($this->translate('Remove navigation item %s'), $item->name)
)
); ?> |
diff --git a/application/views/scripts/navigation/shared.phtml b/application/views/scripts/navigation/shared.phtml
index 939249f84..5d0a3107f 100644
--- a/application/views/scripts/navigation/shared.phtml
+++ b/application/views/scripts/navigation/shared.phtml
@@ -1,4 +1,8 @@
-compact): ?>
+compact): ?>
tabs; ?>
sortBox; ?>
@@ -19,17 +23,19 @@
translate('Unshare'); ?> |
- $item): ?>
+
| qlink(
- $name,
+ $item->name,
'navigation/edit',
array(
- 'name' => $name,
+ 'name' => $item->name,
+ 'type' => $item->type,
+ 'owner' => $item->owner,
'referrer' => 'shared'
),
array(
- 'title' => sprintf($this->translate('Edit shared navigation item %s'), $name)
+ 'title' => sprintf($this->translate('Edit shared navigation item %s'), $item->name)
)
); ?> |
type && isset($types[$item->type])
@@ -48,7 +54,12 @@
)
); ?> |
- setDefault('name', $name); ?> |
+ setDefault('name', $item->name)
+ ->setAction(Url::fromPath(
+ 'navigation/unshare',
+ array('type' => $item->type, 'owner' => $item->owner)
+ )); ?> |
diff --git a/library/Icinga/Application/Config.php b/library/Icinga/Application/Config.php
index bfe2ddd60..d25ec748c 100644
--- a/library/Icinga/Application/Config.php
+++ b/library/Icinga/Application/Config.php
@@ -13,7 +13,9 @@ use Icinga\Data\Selectable;
use Icinga\Data\SimpleQuery;
use Icinga\File\Ini\IniWriter;
use Icinga\File\Ini\IniParser;
+use Icinga\Exception\IcingaException;
use Icinga\Exception\NotReadableError;
+use Icinga\Web\Navigation\Navigation;
/**
* Container for INI like configuration and global registry of application and module related configuration.
@@ -41,6 +43,13 @@ class Config implements Countable, Iterator, Selectable
*/
protected static $modules = array();
+ /**
+ * Navigation config instances per type
+ *
+ * @var array
+ */
+ protected static $navigation = array();
+
/**
* The internal ConfigObject
*
@@ -416,6 +425,60 @@ class Config implements Countable, Iterator, Selectable
return $moduleConfigs[$configname];
}
+ /**
+ * Retrieve a navigation config
+ *
+ * @param string $type The type identifier of the navigation item for which to return its config
+ * @param string $username A user's name or null if the shared config is desired
+ * @param bool $fromDisk If true, the configuration will be read from disk
+ *
+ * @return Config The requested configuration
+ */
+ public static function navigation($type, $username = null, $fromDisk = false)
+ {
+ if (! isset(self::$navigation[$type])) {
+ self::$navigation[$type] = array();
+ }
+
+ $branch = $username ?: 'shared';
+ $typeConfigs = self::$navigation[$type];
+ if (! isset($typeConfigs[$branch]) || $fromDisk) {
+ $typeConfigs[$branch] = static::fromIni(static::getNavigationConfigPath($type, $username));
+ }
+
+ return $typeConfigs[$branch];
+ }
+
+ /**
+ * Return the path to the configuration file for the given navigation item type and user
+ *
+ * @param string $type
+ * @param string $username
+ *
+ * @return string
+ *
+ * @throws IcingaException In case the given type is unknown
+ */
+ protected static function getNavigationConfigPath($type, $username = null)
+ {
+ $itemTypeConfig = Navigation::getItemTypeConfiguration();
+ if (! isset($itemTypeConfig[$type])) {
+ throw new IcingaException('Invalid navigation item type %s provided', $type);
+ }
+
+ if (isset($itemTypeConfig[$type]['config'])) {
+ $filename = $itemTypeConfig[$type]['config'] . '.ini';
+ } else {
+ $filename = $type . 's.ini';
+ }
+
+ return static::resolvePath(
+ ($username ? 'preferences' . DIRECTORY_SEPARATOR . $username : 'navigation')
+ . DIRECTORY_SEPARATOR
+ . $filename
+ );
+ }
+
/**
* Return this config rendered as a INI structured string
*
diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php
index ebbfc3d98..842a581a9 100644
--- a/library/Icinga/Application/Modules/Module.php
+++ b/library/Icinga/Application/Modules/Module.php
@@ -1014,16 +1014,21 @@ class Module
}
/**
- * Provide a new type of configurable navigation item with a optional label
+ * Provide a new type of configurable navigation item with a optional label and config filename
*
* @param string $type
* @param string $label
+ * @param string $config
*
* @return $this
*/
- protected function provideNavigationItem($type, $label = null)
+ protected function provideNavigationItem($type, $label = null, $config = null)
{
- $this->navigationItems[$type] = $label ?: $type;
+ $this->navigationItems[$type] = array(
+ 'label' => $label,
+ 'config' => $config
+ );
+
return $this;
}
diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index 538afb029..da11b9c1e 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -179,12 +179,11 @@ class Web extends EmbeddedWeb
*/
public function getSharedNavigation($type)
{
- $config = Config::app('navigation')->getConfigObject();
- $config->setKeyColumn('name');
+ $config = Config::navigation($type === 'dashboard-pane' ? 'dashlet' : $type);
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 +202,7 @@ class Web extends EmbeddedWeb
}
} else {
$items = array();
- foreach ($config->select()->where('type', $type) as $name => $typeConfig) {
+ foreach ($config as $name => $typeConfig) {
if ($this->hasAccessToSharedNavigationItem($typeConfig)) {
$items[$name] = $typeConfig;
}
diff --git a/library/Icinga/User.php b/library/Icinga/User.php
index 114e59755..626905e9c 100644
--- a/library/Icinga/User.php
+++ b/library/Icinga/User.php
@@ -479,22 +479,6 @@ class User
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,11 @@ class User
*/
public function getNavigation($type)
{
- $config = $this->loadNavigationConfig();
- $config->getConfigObject()->setKeyColumn('name');
+ $config = Config::navigation($type === 'dashboard-pane' ? 'dashlet' : $type, $this->getUsername());
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 +508,7 @@ class User
);
}
} else {
- $navigation = Navigation::fromConfig($config->select()->where('type', $type));
+ $navigation = Navigation::fromConfig($config);
}
return $navigation;
diff --git a/library/Icinga/Web/Navigation/Navigation.php b/library/Icinga/Web/Navigation/Navigation.php
index 9cd3423a3..55101edce 100644
--- a/library/Icinga/Web/Navigation/Navigation.php
+++ b/library/Icinga/Web/Navigation/Navigation.php
@@ -451,6 +451,39 @@ class Navigation implements ArrayAccess, Countable, IteratorAggregate
return $this;
}
+ /**
+ * Return the global navigation item type configuration
+ *
+ * @return array
+ */
+ public static function getItemTypeConfiguration()
+ {
+ $defaultItemTypes = array(
+ 'menu-item' => array(
+ 'label' => t('Menu Entry'),
+ 'config' => 'menu'
+ ),
+ 'dashlet' => array(
+ 'label' => 'Dashlet',
+ 'config' => 'dashboard'
+ )
+ );
+
+ $moduleItemTypes = array();
+ $moduleManager = Icinga::app()->getModuleManager();
+ foreach ($moduleManager->getLoadedModules() as $module) {
+ if (Auth::getInstance()->hasPermission($moduleManager::MODULE_PERMISSION_NS . $module->getName())) {
+ foreach ($module->getNavigationItems() as $type => $options) {
+ if (! isset($moduleItemTypes[$type])) {
+ $moduleItemTypes[$type] = $options;
+ }
+ }
+ }
+ }
+
+ return array_merge($defaultItemTypes, $moduleItemTypes);
+ }
+
/**
* Create and return a new set of navigation items for the given configuration
*