Skip to content

[stable28] enh(NavigationManager): Use ID as fallback for app property of entries #42088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndyScherzinger merged 1 commit into from
Dec 7, 2023
Merged

[stable28] enh(NavigationManager): Use ID as fallback for app property of entries #42088

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
enh(NavigationManager): Use ID as fallback for app property of entries 
Signed-off-by: Ferdinand Thiessen <[email protected]>
  • Loading branch information
@susnux @backportbot-nextcloud
susnux authored and backportbot-nextcloud[bot] committed Dec 7, 2023
commit b82a7d6102dbae6460c7cfffff3a1eadc3041025
10 changes: 8 additions & 2 deletions lib/private/NavigationManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,10 @@ public function add($entry) {
return;
}

$id = $entry['id'];

$entry['active'] = false;
$entry['unread'] = $this->unreadCounters[$id] ?? 0;
if (!isset($entry['icon'])) {
$entry['icon'] = '';
}
Expand All @@ -106,9 +109,12 @@ public function add($entry) {
$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
Expand Down