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

Make default calendar only contain VEVENTS 

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2019-09-15 13:24:09 +02:00
parent 6cca51c2aa
commit dc04154544
No known key found for this signature in database
GPG Key ID: A061B9DDE0CA0773
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/dav/lib/HookManager.php
View File

@ -157,7 +157,8 @@ class HookManager {
try { try {
$this->calDav->createCalendar($principal, CalDavBackend::PERSONAL_CALENDAR_URI, [ $this->calDav->createCalendar($principal, CalDavBackend::PERSONAL_CALENDAR_URI, [
'{DAV:}displayname' => CalDavBackend::PERSONAL_CALENDAR_NAME, '{DAV:}displayname' => CalDavBackend::PERSONAL_CALENDAR_NAME,
'{http://apple.com/ns/ical/}calendar-color' => $this->themingDefaults->getColorPrimary() '{http://apple.com/ns/ical/}calendar-color' => $this->themingDefaults->getColorPrimary(),
'components' => 'VEVENT'
]); ]);
} catch (\Exception $ex) { } catch (\Exception $ex) {
\OC::$server->getLogger()->logException($ex); \OC::$server->getLogger()->logException($ex);

6
apps/dav/tests/unit/DAV/HookManagerTest.php
View File

@ -91,7 +91,8 @@ class HookManagerTest extends TestCase {
'principals/users/newUser', 'principals/users/newUser',
'personal', [ 'personal', [
'{DAV:}displayname' => 'Personal', '{DAV:}displayname' => 'Personal',
'{http://apple.com/ns/ical/}calendar-color' => '#745bca' '{http://apple.com/ns/ical/}calendar-color' => '#745bca',
'components' => 'VEVENT'
]); ]);
/** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $card */ /** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $card */
@ -177,7 +178,8 @@ class HookManagerTest extends TestCase {
'principals/users/newUser', 'principals/users/newUser',
'personal', [ 'personal', [
'{DAV:}displayname' => 'Personal', '{DAV:}displayname' => 'Personal',
'{http://apple.com/ns/ical/}calendar-color' => '#745bca' '{http://apple.com/ns/ical/}calendar-color' => '#745bca',
'components' => 'VEVENT'
]); ]);
/** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $card */ /** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $card */