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

Fix test for ensureSystemAddressBookExists

This commit is contained in:
Thomas Müller 2016-01-13 11:55:50 +01:00
parent 2d16ba9084
commit ac55bac461
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/dav/lib/carddav/carddavbackend.php
View File

@ -26,7 +26,6 @@ namespace OCA\DAV\CardDAV;
use OCA\DAV\Connector\Sabre\Principal;
use OCP\IDBConnection;
use OCP\ILogger;
use Sabre\CardDAV\Backend\BackendInterface;
use Sabre\CardDAV\Backend\SyncSupport;
use Sabre\CardDAV\Plugin;
@ -69,7 +68,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
}
/**
* Returns the list of addressbooks for a specific user.
* Returns the list of address books for a specific user.
*
* Every addressbook should have the following properties:
* id - an arbitrary unique id
@ -821,7 +820,6 @@ class CardDavBackend implements BackendInterface, SyncSupport {
}
$newUri = sha1($addressBook->getName() . $addressBook->getOwner());
// $newUri = $addressBook->getName() . '-' . $addressBook->getOwner();
$query = $this->db->getQueryBuilder();
$query->insert('dav_shares')
->values([
@ -982,6 +980,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
}
/**
* For shared address books the sharee is set in the ACL of the address book
* @param $addressBookId
* @param $acl
* @return array

4
apps/dav/lib/carddav/syncservice.php
View File

@ -90,13 +90,13 @@ class SyncService {
* @throws \Sabre\DAV\Exception\BadRequest
*/
public function ensureSystemAddressBookExists($principal, $id, $properties) {
$book = $this->backend->getAddressBooksByUri($id);
$book = $this->backend->getAddressBooksByUri($principal, $id);
if (!is_null($book)) {
return $book;
}
$this->backend->createAddressBook($principal, $id, $properties);
return $this->backend->getAddressBooksByUri($id);
return $this->backend->getAddressBooksByUri($principal, $id);
}
/**