sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #45786 from nextcloud/fix/caldav/default-vjournal 

fix(caldav): allow VJOURNAL if no supported component set is specified
pull/47202/head
Richard Steinmetz 2024-08-13 17:16:40 +07:00 committed by GitHub
parent 8bf2095001 82615ce868
commit bb706998a9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dav/lib/CalDAV/CalDavBackend.php
Unescape Escape View File

@ -755,7 +755,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
'uri' => $calendarUri,
'synctoken' => 1,
'transparent' => 0,
'components' => 'VEVENT,VTODO',
'components' => 'VEVENT,VTODO,VJOURNAL',
'displayname' => $calendarUri
];

2
apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php
Unescape Escape View File

@ -154,7 +154,7 @@ abstract class AbstractCalDavBackend extends TestCase {
$this->assertEquals(self::UNIT_TEST_USER, $calendars[0]['principaluri']);
/** @var SupportedCalendarComponentSet $components */
$components = $calendars[0]['{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set'];
$this->assertEquals(['VEVENT','VTODO'], $components->getValue());
$this->assertEquals(['VEVENT','VTODO','VJOURNAL'], $components->getValue());
$color = $calendars[0]['{http://apple.com/ns/ical/}calendar-color'];
$this->assertEquals('#1C4587FF', $color);
$this->assertEquals('Example', $calendars[0]['uri']);