mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #24697 from nextcloud/backport/24589/stable20 

[stable20] Add tel, note, org and title search
This commit is contained in:
Roeland Jago Douma 2020-12-15 09:17:30 +01:00 committed by GitHub
parent f0c2807cac d44c6aa524
commit e6e6725024
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/dav/lib/Search/ContactsSearchProvider.php
View File

@ -61,7 +61,11 @@ class ContactsSearchProvider implements IProvider {
'FN', 'FN',
'NICKNAME', 'NICKNAME',
'EMAIL', 'EMAIL',
'TEL',
'ADR', 'ADR',
'TITLE',
'ORG',
'NOTE',
]; ];
/** /**

12
apps/dav/tests/unit/Search/ContactsSearchProviderTest.php
View File

@ -160,7 +160,17 @@ class ContactsSearchProviderTest extends TestCase {
$this->backend->expects($this->once()) $this->backend->expects($this->once())
->method('searchPrincipalUri') ->method('searchPrincipalUri')
->with('principals/users/john.doe', 'search term', ->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]) ['limit' => 5, 'offset' => 20])
->willReturn([ ->willReturn([
[ [