upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 01:30:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 79

Allow settings navigation items with no route entry

Browse source 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
(cherry picked from commit 62b7bb7395)
This commit is contained in:
Christopher Ng 2023-02-09 11:01:54 -08:00
parent bbcfa69dd2
commit 08845f73c9
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/private/App/InfoParser.php
View file

@ -225,6 +225,10 @@ class InfoParser {
* @return bool
*/
private function isNavigationItem($data): bool {
// Allow settings navigation items with no route entry
if ($data['type'] === 'settings') {
return isset($data['name']);
}
return isset($data['name'], $data['route']);
}

10
lib/private/NavigationManager.php
View file

@ -301,11 +301,15 @@ class NavigationManager implements INavigationManager {
continue;
}
foreach ($info['navigations']['navigation'] as $key => $nav) {
$nav['type'] = $nav['type'] ?? 'link';
if (!isset($nav['name'])) {
continue;
}
if (!isset($nav['route'])) {
continue;
// Allow settings navigation items with no route entry, all other types require one
if ($nav['type'] !== 'settings') {
continue;
}
}
$role = isset($nav['@attributes']['role']) ? $nav['@attributes']['role'] : 'all';
if ($role === 'admin' && !$this->isAdmin()) {
@ -314,8 +318,8 @@ class NavigationManager implements INavigationManager {
$l = $this->l10nFac->get($app);
$id = $nav['id'] ?? $app . ($key === 0 ? '' : $key);
$order = isset($nav['order']) ? $nav['order'] : 100;
$type = isset($nav['type']) ? $nav['type'] : 'link';
$route = $nav['route'] !== '' ? $this->urlGenerator->linkToRoute($nav['route']) : '';
$type = $nav['type'];
$route = !empty($nav['route']) ? $this->urlGenerator->linkToRoute($nav['route']) : '';
$icon = isset($nav['icon']) ? $nav['icon'] : 'app.svg';
foreach ([$icon, "$app.svg"] as $i) {
try {