Navigation: Load a user's navigation items

refs #5600
This commit is contained in:
Johannes Meyer 2015-09-07 12:20:14 +02:00
parent a012595e3d
commit f958a1c323

View File

@ -413,9 +413,12 @@ class Navigation implements ArrayAccess, Countable, IteratorAggregate
*/ */
public function load($type) public function load($type)
{ {
$user = Auth::getInstance()->getUser();
$this->merge($user->getNavigation($type));
$moduleManager = Icinga::app()->getModuleManager(); $moduleManager = Icinga::app()->getModuleManager();
foreach ($moduleManager->getLoadedModules() as $module) { foreach ($moduleManager->getLoadedModules() as $module) {
if (Auth::getInstance()->hasPermission($moduleManager::MODULE_PERMISSION_NS . $module->getName())) { if ($user->can($moduleManager::MODULE_PERMISSION_NS . $module->getName())) {
if ($type === 'menu-item') { if ($type === 'menu-item') {
$this->merge($module->getMenu()); $this->merge($module->getMenu());
} elseif ($type === 'dashboard-pane') { } elseif ($type === 'dashboard-pane') {