From 570ee078a0b087c4d67ea74498864f89ac7da5cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Tue, 10 Apr 2018 14:23:30 +0200 Subject: [PATCH] Use new navigation endpoint and get rid of the legacy navigationdetect ajax MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- settings/ajax/navigationdetect.php | 28 ---------------------------- settings/js/apps.js | 6 +++--- settings/routes.php | 2 -- 3 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 settings/ajax/navigationdetect.php diff --git a/settings/ajax/navigationdetect.php b/settings/ajax/navigationdetect.php deleted file mode 100644 index 35cc25f19f..0000000000 --- a/settings/ajax/navigationdetect.php +++ /dev/null @@ -1,28 +0,0 @@ - - * @author Robin McCorkell - * - * @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 - * - */ -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 0e5d7308e4..05514a10de 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 ecf68791a2..df49f0af85 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');