Skip to content

[Upstream] fix birthday calendar component #1457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LukasReschke merged 2 commits into from
Sep 26, 2016
Merged

[Upstream] fix birthday calendar component #1457

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6eb1bc5
The birthday calendar can only hold VEVENT - refs https://github.com/…
DeepDiver1975 Jul 28, 2016
1f825f0
Adding repair step to fix component of birthday calendars
DeepDiver1975 Jul 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
The birthday calendar can only hold VEVENT - refs owncloud/tasks#338
  • Loading branch information
@DeepDiver1975 @LukasReschke
DeepDiver1975 authored and LukasReschke committed Sep 20, 2016
commit 6eb1bc55ab24cf1cfae5995d5fbb976120df32d5
1 change: 1 addition & 0 deletions apps/dav/lib/CalDAV/BirthdayService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ public function ensureCalendarExists($principal) {
$this->calDavBackEnd->createCalendar($principal, self::BIRTHDAY_CALENDAR_URI, [
'{DAV:}displayname' => 'Contact birthdays',
'{http://apple.com/ns/ical/}calendar-color' => '#FFFFCA',
'components' => 'VEVENT',
]);

return $this->calDavBackEnd->getCalendarByUri($principal, self::BIRTHDAY_CALENDAR_URI);
Expand Down
11 changes: 11 additions & 0 deletions apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,17 @@ public function testGetAllAffectedPrincipals() {
], $users);
}

public function testBirthdayCalendarHasComponentEvent() {
$this->calDav->expects($this->once())
->method('createCalendar')
->with('principal001', 'contact_birthdays', [
'{DAV:}displayname' => 'Contact birthdays',
'{http://apple.com/ns/ical/}calendar-color' => '#FFFFCA',
'components' => 'VEVENT',
]);
$this->service->ensureCalendarExists('principal001');
}

public function providesBirthday() {
return [
[true,
Expand Down