upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-07 15:53:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge pull request #41837 from nextcloud/backport/41738/stable28

Browse source 
[stable28] feat(dav): hide search providers if their respective app is not activated
This commit is contained in:
Andy Scherzinger 2023-11-29 11:50:43 +01:00 committed by GitHub
commit 81b4563039
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/dav/lib/Search/ContactsSearchProvider.php
View file

@ -83,11 +83,12 @@ class ContactsSearchProvider implements IFilteringProvider {
return $this->l10n->t('Contacts');
}
public function getOrder(string $route, array $routeParameters): int {
if ($route === 'contacts.Page.index') {
return -1;
public function getOrder(string $route, array $routeParameters): ?int {
if ($this->appManager->isEnabledForUser('contacts')) {
return $route === 'contacts.Page.index' ? -1 : 25;
}
return 25;
return null;
}
public function search(IUser $user, ISearchQuery $query): SearchResult {

9
apps/dav/lib/Search/EventsSearchProvider.php
View file

@ -89,11 +89,12 @@ class EventsSearchProvider extends ACalendarSearchProvider implements IFiltering
/**
* @inheritDoc
*/
public function getOrder(string $route, array $routeParameters): int {
if ($route === 'calendar.View.index') {
return -1;
public function getOrder(string $route, array $routeParameters): ?int {
if ($this->appManager->isEnabledForUser('calendar')) {
return $route === 'calendar.View.index' ? -1 : 30;
}
return 30;
return null;
}
/**

9
apps/dav/lib/Search/TasksSearchProvider.php
View file

@ -77,11 +77,12 @@ class TasksSearchProvider extends ACalendarSearchProvider {
/**
* @inheritDoc
*/
public function getOrder(string $route, array $routeParameters): int {
if ($route === 'tasks.Page.index') {
return -1;
public function getOrder(string $route, array $routeParameters): ?int {
if ($this->appManager->isEnabledForUser('tasks')) {
return $route === 'tasks.Page.index' ? -1 : 35;
}
return 35;
return null;
}
/**