tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-29 16:54:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Module: Utilize MenuItemContainer instead of Menu

Browse Source 
refs #5600
This commit is contained in:
Johannes Meyer 2015-09-04 13:54:53 +02:00
parent 8643fec309
commit 27a6b5bb75
1 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
library/Icinga/Application/Modules/Module.php
View File

@ -11,7 +11,7 @@ use Icinga\Application\ApplicationBootstrap;
use Icinga\Application\Config; use Icinga\Application\Config;
use Icinga\Application\Icinga; use Icinga\Application\Icinga;
use Icinga\Application\Logger; use Icinga\Application\Logger;
use Icinga\Data\ConfigObject; use Icinga\Application\Modules\MenuItemContainer;
use Icinga\Exception\IcingaException; use Icinga\Exception\IcingaException;
use Icinga\Exception\ProgrammingError; use Icinga\Exception\ProgrammingError;
use Icinga\Module\Setup\SetupWizard; use Icinga\Module\Setup\SetupWizard;
@ -19,7 +19,7 @@ use Icinga\Util\File;
use Icinga\Util\Translator; use Icinga\Util\Translator;
use Icinga\Web\Controller\Dispatcher; use Icinga\Web\Controller\Dispatcher;
use Icinga\Web\Hook; use Icinga\Web\Hook;
use Icinga\Web\Menu; use Icinga\Web\Navigation\Navigation;
use Icinga\Web\Widget; use Icinga\Web\Widget;
use Icinga\Web\Widget\Dashboard\Pane; use Icinga\Web\Widget\Dashboard\Pane;
@ -189,7 +189,7 @@ class Module
/** /**
* A set of menu elements * A set of menu elements
* *
* @var Menu[] * @var MenuItemContainer[]
*/ */
protected $menuItems = array(); protected $menuItems = array();
@ -301,14 +301,34 @@ class Module
} }
/** /**
* Get all menu items * Return this module's menu
* *
* @return array * @return Navigation
*/ */
public function getMenuItems() public function getMenu()
{ {
$this->launchConfigScript(); $this->launchConfigScript();
return $this->menuItems; return $this->createMenu($this->menuItems);
}
/**
* Create and return a new navigation for the given menu items
*
* @param MenuItemContainer[] $items
*
* @return Navigation
*/
private function createMenu(array $items)
{
$navigation = new Navigation();
foreach ($items as $item) {
/** @var MenuItemContainer $item */
$navigationItem = $navigation->createItem($item->getName(), $item->getProperties());
$navigationItem->setChildren($this->createMenu($item->getChildren()));
$navigation->addItem($navigationItem);
}
return $navigation;
} }
/** /**
@ -317,14 +337,14 @@ class Module
* @param string $name * @param string $name
* @param array $properties * @param array $properties
* *
* @return Menu * @return MenuItemContainer
*/ */
protected function menuSection($name, array $properties = array()) protected function menuSection($name, array $properties = null)
{ {
if (array_key_exists($name, $this->menuItems)) { if (array_key_exists($name, $this->menuItems)) {
$this->menuItems[$name]->setProperties($properties); $this->menuItems[$name]->setProperties($properties);
} else { } else {
$this->menuItems[$name] = new Menu($name, new ConfigObject($properties)); $this->menuItems[$name] = new MenuItemContainer($name, $properties);
} }
return $this->menuItems[$name]; return $this->menuItems[$name];