diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2020-08-05 17:56:01 +0200 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2020-08-05 17:57:17 +0200 |
| commit | d2c0569b490235ae6d01087a676b2f2075a1dcb7 (patch) | |
| tree | 088cd2e214cd5c22ad1d6de688b559ae7ebc33c8 /apps/dav | |
| parent | 55473dd2eb042078b7fc5aef37e7b7fb614554fa (diff) | |
| download | nextcloud-server-d2c0569b490235ae6d01087a676b2f2075a1dcb7.tar.gz nextcloud-server-d2c0569b490235ae6d01087a676b2f2075a1dcb7.zip | |
Fix search providers order and IDs
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'apps/dav')
6 files changed, 9 insertions, 9 deletions
diff --git a/apps/dav/lib/Search/ContactsSearchProvider.php b/apps/dav/lib/Search/ContactsSearchProvider.php index f97ba2cf634..78747ebd70e 100644 --- a/apps/dav/lib/Search/ContactsSearchProvider.php +++ b/apps/dav/lib/Search/ContactsSearchProvider.php @@ -83,7 +83,7 @@ class ContactsSearchProvider implements IProvider { * @inheritDoc */ public function getId(): string { - return 'contacts-dav'; + return 'contacts'; } /** @@ -100,7 +100,7 @@ class ContactsSearchProvider implements IProvider { if ($route === 'contacts.Page.index') { return -1; } - return 20; + return 25; } /** diff --git a/apps/dav/lib/Search/EventsSearchProvider.php b/apps/dav/lib/Search/EventsSearchProvider.php index 619775aa193..c27996f96e7 100644 --- a/apps/dav/lib/Search/EventsSearchProvider.php +++ b/apps/dav/lib/Search/EventsSearchProvider.php @@ -69,7 +69,7 @@ class EventsSearchProvider extends ACalendarSearchProvider { * @inheritDoc */ public function getId(): string { - return 'calendar-dav'; + return 'calendar'; } /** @@ -86,7 +86,7 @@ class EventsSearchProvider extends ACalendarSearchProvider { if ($route === 'calendar.View.index') { return -1; } - return 10; + return 30; } /** diff --git a/apps/dav/lib/Search/TasksSearchProvider.php b/apps/dav/lib/Search/TasksSearchProvider.php index adc1197aa18..5af694bb85d 100644 --- a/apps/dav/lib/Search/TasksSearchProvider.php +++ b/apps/dav/lib/Search/TasksSearchProvider.php @@ -61,7 +61,7 @@ class TasksSearchProvider extends ACalendarSearchProvider { * @inheritDoc */ public function getId(): string { - return 'tasks-dav'; + return 'tasks'; } /** @@ -78,7 +78,7 @@ class TasksSearchProvider extends ACalendarSearchProvider { if ($route === 'tasks.Page.index') { return -1; } - return 10; + return 35; } /** diff --git a/apps/dav/tests/unit/Search/ContactsSearchProviderTest.php b/apps/dav/tests/unit/Search/ContactsSearchProviderTest.php index 858e79d4423..1ca0457adb6 100644 --- a/apps/dav/tests/unit/Search/ContactsSearchProviderTest.php +++ b/apps/dav/tests/unit/Search/ContactsSearchProviderTest.php @@ -88,7 +88,7 @@ class ContactsSearchProviderTest extends TestCase { } public function testGetId(): void { - $this->assertEquals('contacts-dav', $this->provider->getId()); + $this->assertEquals('contacts', $this->provider->getId()); } public function testGetName(): void { diff --git a/apps/dav/tests/unit/Search/EventsSearchProviderTest.php b/apps/dav/tests/unit/Search/EventsSearchProviderTest.php index eedbe39f12a..cd905760fac 100644 --- a/apps/dav/tests/unit/Search/EventsSearchProviderTest.php +++ b/apps/dav/tests/unit/Search/EventsSearchProviderTest.php @@ -250,7 +250,7 @@ class EventsSearchProviderTest extends TestCase { } public function testGetId(): void { - $this->assertEquals('calendar-dav', $this->provider->getId()); + $this->assertEquals('calendar', $this->provider->getId()); } public function testGetName(): void { diff --git a/apps/dav/tests/unit/Search/TasksSearchProviderTest.php b/apps/dav/tests/unit/Search/TasksSearchProviderTest.php index 7220ff4ef48..732625980e8 100644 --- a/apps/dav/tests/unit/Search/TasksSearchProviderTest.php +++ b/apps/dav/tests/unit/Search/TasksSearchProviderTest.php @@ -134,7 +134,7 @@ class TasksSearchProviderTest extends TestCase { } public function testGetId(): void { - $this->assertEquals('tasks-dav', $this->provider->getId()); + $this->assertEquals('tasks', $this->provider->getId()); } public function testGetName(): void { |