Merge pull request #9132 from nextcloud/remove-navigation-ajax

Replace the ajax navigationdetect endpoint with the new one from NavigationController

3 files changed, 3 insertions, 33 deletions

diff --git a/settings/ajax/navigationdetect.php b/settings/ajax/navigationdetect.php
deleted file mode 100644
index 35cc25f19ff..00000000000
--- a/settings/ajax/navigationdetect.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Robin Appelman <robin@icewind.nl>
- * @author Robin McCorkell <robin@mccorkell.me.uk>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-OC_Util::checkAdminUser();
-\OC_JSON::callCheck();
-
-$navigation = \OC::$server->getNavigationManager()->getAll();
-
-\OC_JSON::success(['nav_entries' => $navigation]);
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 0e5d7308e40..05514a10de2 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -597,10 +597,10 @@ OC.Settings.Apps = OC.Settings.Apps || {
 	},
 
 	rebuildNavigation: function() {
-		$.getJSON(OC.filePath('settings', 'ajax', 'navigationdetect.php')).done(function(response){
-			if(response.status === 'success') {
+		$.getJSON(OC.linkToOCS('core/navigation', 2) + 'apps?format=json').done(function(response){
+			if(response.ocs.meta.status === 'ok') {
 				var addedApps = {};
-				var navEntries = response.nav_entries;
+				var navEntries = response.ocs.data;
 				var container = $('#apps ul');
 
 				// remove disabled apps
diff --git a/settings/routes.php b/settings/routes.php
index ecf68791a27..df49f0af859 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -106,8 +106,6 @@ $this->create('settings_ajax_updateapp', '/settings/ajax/updateapp.php')
 	->actionInclude('settings/ajax/updateapp.php');
 $this->create('settings_ajax_uninstallapp', '/settings/ajax/uninstallapp.php')
 	->actionInclude('settings/ajax/uninstallapp.php');
-$this->create('settings_ajax_navigationdetect', '/settings/ajax/navigationdetect.php')
-	->actionInclude('settings/ajax/navigationdetect.php');
 // admin
 $this->create('settings_ajax_excludegroups', '/settings/ajax/excludegroups.php')
 	->actionInclude('settings/ajax/excludegroups.php');