aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@users.noreply.github.com>2020-12-14 17:39:37 +0100
committerGitHub <noreply@github.com>2020-12-14 17:39:37 +0100
commit1f8237412fafa3f1c720357171ea3db44696ac2d (patch)
tree0584b02634c12e2e0dda0b9df81eaf8a0d4c2a7e
parentb56d7f9f4e0b9c5126c7a87544e918713923e96e (diff)
parent45b3ddd882e395af17cc9ffb7476b8a124d903ee (diff)
downloadnextcloud-server-1f8237412fafa3f1c720357171ea3db44696ac2d.tar.gz
nextcloud-server-1f8237412fafa3f1c720357171ea3db44696ac2d.zip
Merge pull request #24589 from nextcloud/fix/search-dav
Add tel, note, org and title search
-rw-r--r--apps/dav/lib/Search/ContactsSearchProvider.php4
-rw-r--r--apps/dav/tests/unit/Search/ContactsSearchProviderTest.php12
2 files changed, 15 insertions, 1 deletions
diff --git a/apps/dav/lib/Search/ContactsSearchProvider.php b/apps/dav/lib/Search/ContactsSearchProvider.php
index a76e1f7fefd..d92226aa1b1 100644
--- a/apps/dav/lib/Search/ContactsSearchProvider.php
+++ b/apps/dav/lib/Search/ContactsSearchProvider.php
@@ -61,7 +61,11 @@ class ContactsSearchProvider implements IProvider {
'FN',
'NICKNAME',
'EMAIL',
+ 'TEL',
'ADR',
+ 'TITLE',
+ 'ORG',
+ 'NOTE',
];
/**
diff --git a/apps/dav/tests/unit/Search/ContactsSearchProviderTest.php b/apps/dav/tests/unit/Search/ContactsSearchProviderTest.php
index 640ada0a9df..7e9fc6d9a49 100644
--- a/apps/dav/tests/unit/Search/ContactsSearchProviderTest.php
+++ b/apps/dav/tests/unit/Search/ContactsSearchProviderTest.php
@@ -160,7 +160,17 @@ class ContactsSearchProviderTest extends TestCase {
$this->backend->expects($this->once())
->method('searchPrincipalUri')
->with('principals/users/john.doe', 'search term',
- ['N', 'FN', 'NICKNAME', 'EMAIL', 'ADR'],
+ [
+ 'N',
+ 'FN',
+ 'NICKNAME',
+ 'EMAIL',
+ 'TEL',
+ 'ADR',
+ 'TITLE',
+ 'ORG',
+ 'NOTE',
+ ],
['limit' => 5, 'offset' => 20])
->willReturn([
[