diff options
| author | Côme Chilliet <come.chilliet@nextcloud.com> | 2023-09-26 14:22:34 +0200 |
|---|---|---|
| committer | Côme Chilliet <come.chilliet@nextcloud.com> | 2023-09-26 14:22:57 +0200 |
| commit | 6083d32a805d90b5a3bc83577ab81c946b8dd40c (patch) | |
| tree | ac50ca70216791b32e8de1af7ef63da9b05f0bae /lib | |
| parent | a3a42591e2e85e5903217052b246e46dbbf4c1c7 (diff) | |
| download | nextcloud-server-6083d32a805d90b5a3bc83577ab81c946b8dd40c.tar.gz nextcloud-server-6083d32a805d90b5a3bc83577ab81c946b8dd40c.zip | |
Revert "Support admin default order for applications"
This reverts commit a3a42591e2e85e5903217052b246e46dbbf4c1c7.
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/NavigationManager.php | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/private/NavigationManager.php b/lib/private/NavigationManager.php index 9ef22132ea5..ef6e6f4cb74 100644 --- a/lib/private/NavigationManager.php +++ b/lib/private/NavigationManager.php @@ -284,16 +284,10 @@ class NavigationManager implements INavigationManager { return; } - $adminCustomOrders = json_decode($this->config->getSystemValueString('apporder', '[]'), true, flags:JSON_THROW_ON_ERROR); - $forceAdminOrder = $this->config->getSystemValueBool('apporderForce', false); if ($this->userSession->isLoggedIn()) { $user = $this->userSession->getUser(); $apps = $this->appManager->getEnabledAppsForUser($user); - if ($forceAdminOrder) { - $customOrders = []; - } else { - $customOrders = json_decode($this->config->getUserValue($user->getUID(), 'core', 'apporder', '[]'), true, flags:JSON_THROW_ON_ERROR); - } + $customOrders = json_decode($this->config->getUserValue($user->getUID(), 'core', 'apporder', '[]'), true, flags:JSON_THROW_ON_ERROR); } else { $apps = $this->appManager->getInstalledApps(); $customOrders = []; @@ -325,7 +319,7 @@ class NavigationManager implements INavigationManager { } $l = $this->l10nFac->get($app); $id = $nav['id'] ?? $app . ($key === 0 ? '' : $key); - $order = $customOrders[$app][$key] ?? $adminCustomOrders[$app][$key] ?? $nav['order'] ?? 100; + $order = $customOrders[$app][$key] ?? $nav['order'] ?? 100; $type = $nav['type']; $route = !empty($nav['route']) ? $this->urlGenerator->linkToRoute($nav['route']) : ''; $icon = isset($nav['icon']) ? $nav['icon'] : 'app.svg'; |