tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Navigation: Do not provide "dashlet" as default item type 

Please revert this commit once we're about to finish the new
implementation.

refs #6084
This commit is contained in:
Johannes Meyer 2015-09-30 12:55:21 +02:00
parent ff25c24825
commit 1c7b398219
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/Icinga/Web/Navigation/Navigation.php
View File

@ -429,12 +429,14 @@ class Navigation implements ArrayAccess, Countable, IteratorAggregate
*/
public function load($type)
{
$user = Auth::getInstance()->getUser();
if ($type !== 'dashboard-pane') {
// Shareables
$this->merge(Icinga::app()->getSharedNavigation($type));
// User Preferences
$user = Auth::getInstance()->getUser();
$this->merge($user->getNavigation($type));
}
// Modules
$moduleManager = Icinga::app()->getModuleManager();
@ -462,11 +464,11 @@ class Navigation implements ArrayAccess, Countable, IteratorAggregate
'menu-item' => array(
'label' => t('Menu Entry'),
'config' => 'menu'
),
)/*, // Disabled, until it is able to fully replace the old implementation
'dashlet' => array(
'label' => 'Dashlet',
'config' => 'dashboard'
)
)*/
);
$moduleItemTypes = array();

1
library/Icinga/Web/Widget/Dashboard.php
View File

@ -85,6 +85,7 @@ class Dashboard extends AbstractWidget
}
$this->mergePanes($panes);
$this->loadUserDashboards();
return $this;
}