diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-06-14 23:00:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-14 23:00:39 -0500 |
| commit | ac565cecadc1760e128293e5be6955a9b1fc85e4 (patch) | |
| tree | 12118264d632af6cb51b1892463ad9b7f4989b67 /apps/dav | |
| parent | db14089d6c92f750b66d57c127b521c0acf01943 (diff) | |
| parent | 0f1d47cdf3d2923f3ea85d4601e0a31d8e8e4e1e (diff) | |
| download | nextcloud-server-ac565cecadc1760e128293e5be6955a9b1fc85e4.tar.gz nextcloud-server-ac565cecadc1760e128293e5be6955a9b1fc85e4.zip | |
Merge pull request #5300 from nextcloud/bugfix/noid/fix_proppatch_requests_to_groupshares
allow users to send PropPatch request when calendar is group-shared with them
Diffstat (limited to 'apps/dav')
| -rw-r--r-- | apps/dav/lib/CalDAV/Calendar.php | 6 | ||||
| -rw-r--r-- | apps/dav/tests/unit/CalDAV/CalendarTest.php | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/apps/dav/lib/CalDAV/Calendar.php b/apps/dav/lib/CalDAV/Calendar.php index c03bf98ee38..75e78daf505 100644 --- a/apps/dav/lib/CalDAV/Calendar.php +++ b/apps/dav/lib/CalDAV/Calendar.php @@ -142,6 +142,12 @@ class Calendar extends \Sabre\CalDAV\Calendar implements IShareable { 'principal' => parent::getOwner(), 'protected' => true, ]; + } else { + $acl[] = [ + 'privilege' => '{DAV:}write-properties', + 'principal' => parent::getOwner(), + 'protected' => true, + ]; } } if ($this->isPublic()) { diff --git a/apps/dav/tests/unit/CalDAV/CalendarTest.php b/apps/dav/tests/unit/CalDAV/CalendarTest.php index fd74da0214b..d9ea25b268c 100644 --- a/apps/dav/tests/unit/CalDAV/CalendarTest.php +++ b/apps/dav/tests/unit/CalDAV/CalendarTest.php @@ -209,6 +209,12 @@ class CalendarTest extends TestCase { 'principal' => 'user2', 'protected' => true ]; + } else { + $expectedAcl[] = [ + 'privilege' => '{DAV:}write-properties', + 'principal' => 'user2', + 'protected' => true + ]; } } $this->assertEquals($expectedAcl, $acl); |