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

Merge pull request #5296 from nextcloud/bugfix-stable12/5077/allow_proppatches_to_birthday_calendar 

[stable12] allow PropPatch requests to contact_birthdays
This commit is contained in:
Morris Jobke 2017-06-13 18:11:54 -05:00 committed by GitHub
parent d4eb5cfecb 01b6a3da86
commit 1d2c1cf579
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/dav/lib/CalDAV/Calendar.php
View File

@ -122,7 +122,14 @@ class Calendar extends \Sabre\CalDAV\Calendar implements IShareable {
'principal' => $this->getOwner(), 'principal' => $this->getOwner(),
'protected' => true, 'protected' => true,
]; ];
} else {
$acl[] = [
'privilege' => '{DAV:}write-properties',
'principal' => $this->getOwner(),
'protected' => true,
];
} }
if ($this->getOwner() !== parent::getOwner()) { if ($this->getOwner() !== parent::getOwner()) {
$acl[] = [ $acl[] = [
'privilege' => '{DAV:}read', 'privilege' => '{DAV:}read',

4
apps/dav/tests/unit/CalDAV/CalendarTest.php
View File

@ -191,6 +191,10 @@ class CalendarTest extends TestCase {
'privilege' => '{DAV:}read', 'privilege' => '{DAV:}read',
'principal' => $hasOwnerSet ? 'user1' : 'user2', 'principal' => $hasOwnerSet ? 'user1' : 'user2',
'protected' => true 'protected' => true
], [
'privilege' => '{DAV:}write-properties',
'principal' => $hasOwnerSet ? 'user1' : 'user2',
'protected' => true
]]; ]];
} }
if ($hasOwnerSet) { if ($hasOwnerSet) {