Deprecate static methods and use Navigation manager
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
parent
39529851a8
commit
ada5aed35e
|
@ -80,9 +80,9 @@ class TemplateLayout extends \OC_Template {
|
||||||
// Add navigation entry
|
// Add navigation entry
|
||||||
$this->assign( 'application', '');
|
$this->assign( 'application', '');
|
||||||
$this->assign( 'appid', $appId );
|
$this->assign( 'appid', $appId );
|
||||||
$navigation = \OC_App::getNavigation();
|
$navigation = \OC::$server->getNavigationManager()->getAll();
|
||||||
$this->assign( 'navigation', $navigation);
|
$this->assign( 'navigation', $navigation);
|
||||||
$settingsNavigation = \OC_App::getSettingsNavigation();
|
$settingsNavigation = \OC::$server->getNavigationManager()->getAll('settings');
|
||||||
$this->assign( 'settingsnavigation', $settingsNavigation);
|
$this->assign( 'settingsnavigation', $settingsNavigation);
|
||||||
foreach($navigation as $entry) {
|
foreach($navigation as $entry) {
|
||||||
if ($entry['active']) {
|
if ($entry['active']) {
|
||||||
|
|
|
@ -586,6 +586,7 @@ class OC_App {
|
||||||
* Returns the navigation
|
* Returns the navigation
|
||||||
*
|
*
|
||||||
* @return array
|
* @return array
|
||||||
|
* @deprecated 14.0.0 use \OC::$server->getNavigationManager()->getAll()
|
||||||
*
|
*
|
||||||
* This function returns an array containing all entries added. The
|
* This function returns an array containing all entries added. The
|
||||||
* entries are sorted by the key 'order' ascending. Additional to the keys
|
* entries are sorted by the key 'order' ascending. Additional to the keys
|
||||||
|
@ -600,6 +601,7 @@ class OC_App {
|
||||||
* Returns the Settings Navigation
|
* Returns the Settings Navigation
|
||||||
*
|
*
|
||||||
* @return string[]
|
* @return string[]
|
||||||
|
* @deprecated 14.0.0 use \OC::$server->getNavigationManager()->getAll('settings')
|
||||||
*
|
*
|
||||||
* This function returns an array containing all settings pages added. The
|
* This function returns an array containing all settings pages added. The
|
||||||
* entries are sorted by the key 'order' ascending.
|
* entries are sorted by the key 'order' ascending.
|
||||||
|
|
|
@ -23,6 +23,6 @@
|
||||||
OC_Util::checkAdminUser();
|
OC_Util::checkAdminUser();
|
||||||
OCP\JSON::callCheck();
|
OCP\JSON::callCheck();
|
||||||
|
|
||||||
$navigation = \OC_App::getNavigation();
|
$navigation = \OC::$server->getNavigationManager()->getAll();
|
||||||
|
|
||||||
OCP\JSON::success(['nav_entries' => $navigation]);
|
OCP\JSON::success(['nav_entries' => $navigation]);
|
||||||
|
|
Loading…
Reference in New Issue