mirror of
https://github.com/Icinga/icingaweb2.git
synced 2025-07-28 08:14:03 +02:00
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:
parent
ff25c24825
commit
1c7b398219
@ -429,12 +429,14 @@ class Navigation implements ArrayAccess, Countable, IteratorAggregate
|
|||||||
*/
|
*/
|
||||||
public function load($type)
|
public function load($type)
|
||||||
{
|
{
|
||||||
// Shareables
|
|
||||||
$this->merge(Icinga::app()->getSharedNavigation($type));
|
|
||||||
|
|
||||||
// User Preferences
|
|
||||||
$user = Auth::getInstance()->getUser();
|
$user = Auth::getInstance()->getUser();
|
||||||
$this->merge($user->getNavigation($type));
|
if ($type !== 'dashboard-pane') {
|
||||||
|
// Shareables
|
||||||
|
$this->merge(Icinga::app()->getSharedNavigation($type));
|
||||||
|
|
||||||
|
// User Preferences
|
||||||
|
$this->merge($user->getNavigation($type));
|
||||||
|
}
|
||||||
|
|
||||||
// Modules
|
// Modules
|
||||||
$moduleManager = Icinga::app()->getModuleManager();
|
$moduleManager = Icinga::app()->getModuleManager();
|
||||||
@ -462,11 +464,11 @@ class Navigation implements ArrayAccess, Countable, IteratorAggregate
|
|||||||
'menu-item' => array(
|
'menu-item' => array(
|
||||||
'label' => t('Menu Entry'),
|
'label' => t('Menu Entry'),
|
||||||
'config' => 'menu'
|
'config' => 'menu'
|
||||||
),
|
)/*, // Disabled, until it is able to fully replace the old implementation
|
||||||
'dashlet' => array(
|
'dashlet' => array(
|
||||||
'label' => 'Dashlet',
|
'label' => 'Dashlet',
|
||||||
'config' => 'dashboard'
|
'config' => 'dashboard'
|
||||||
)
|
)*/
|
||||||
);
|
);
|
||||||
|
|
||||||
$moduleItemTypes = array();
|
$moduleItemTypes = array();
|
||||||
|
@ -85,6 +85,7 @@ class Dashboard extends AbstractWidget
|
|||||||
}
|
}
|
||||||
|
|
||||||
$this->mergePanes($panes);
|
$this->mergePanes($panes);
|
||||||
|
$this->loadUserDashboards();
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user