Mirrors/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2024-09-13 15:48:32 +02:00
Code Issues Actions 47 Packages Projects Releases Wiki Activity

Merge pull request #42055 from nextcloud/enh/navigation-manager-set-app-from-id

Browse Source 
enh(NavigationManager): Use ID as fallback for `app` property of entries
This commit is contained in:
Joas Schilling 2023-12-07 09:09:01 +01:00 committed by GitHub
commit 929678856c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/private/NavigationManager.php
View File

@ -95,7 +95,10 @@ class NavigationManager implements INavigationManager {
return;
}
$id = $entry['id'];
$entry['active'] = false;
$entry['unread'] = $this->unreadCounters[$id] ?? 0;
if (!isset($entry['icon'])) {
$entry['icon'] = '';
}
@ -106,9 +109,12 @@ class NavigationManager implements INavigationManager {
$entry['type'] = 'link';
}
$id = $entry['id'];
$entry['unread'] = $this->unreadCounters[$id] ?? 0;
if ($entry['type'] === 'link') {
// app might not be set when using closures, in this case try to fallback to ID
if (!isset($entry['app']) && $this->appManager->isEnabledForUser($id)) {
$entry['app'] = $id;
}
// This is the default app that will always be shown first
$entry['default'] = ($entry['app'] ?? false) === $this->defaultApp;
// Set order from user defined app order