The birthday calendar can only hold VEVENT #25636

Merged
merged 2 commits into from Sep 7, 2016

Projects

None yet

7 participants

@DeepDiver1975
Member
DeepDiver1975 commented Jul 28, 2016 edited
@DeepDiver1975 DeepDiver1975 added this to the 9.2 milestone Jul 28, 2016
@mention-bot

@DeepDiver1975, thanks for your PR! By analyzing the annotation information on this pull request, we identified @nickvergessen, @tcitworld, @stweil and @DeepDiver1975 to be potential reviewers

@DeepDiver1975 DeepDiver1975 changed the title from The birthday calendar can only hold VEVENT - refs to The birthday calendar can only hold VEVENT Jul 28, 2016
@raimund-schluessler

Hm, after applying this patch I still get this response for the birthday-calendar

 <d:response>
  <d:href>/owncloud/remote.php/dav/calendars/admin/contact_birthdays/</d:href>
  <d:propstat>
   <d:prop>
    <d:displayname>Contact birthdays</d:displayname>
    <cal:calendar-description/>
    <cal:calendar-timezone/>
    <x1:calendar-order xmlns:x1="http://apple.com/ns/ical/">0</x1:calendar-order>
    <x1:calendar-color xmlns:x1="http://apple.com/ns/ical/">#FFFFCA</x1:calendar-color>
    <cal:supported-calendar-component-set>
     <cal:comp name="VEVENT"/>
     <cal:comp name="VTODO"/>
    </cal:supported-calendar-component-set>
    <d:acl>
     <d:ace>
      <d:principal>
       <d:href>/owncloud/remote.php/dav/principals/users/admin/</d:href>
      </d:principal>
      <d:grant>
       <d:privilege>
        <d:read/>
       </d:privilege>
      </d:grant>
      <d:protected/>
     </d:ace>
    </d:acl>
    <d:owner>
     <d:href>/owncloud/remote.php/dav/principals/users/admin/</d:href>
    </d:owner>
    <oc:invite/>
   </d:prop>
   <d:status>HTTP/1.1 200 OK</d:status>
  </d:propstat>
  <d:propstat>
   <d:prop>
    <oc:calendar-enabled/>
   </d:prop>
   <d:status>HTTP/1.1 404 Not Found</d:status>
  </d:propstat>
 </d:response>

Since there is still a VTODO in it, the Tasks app does still show the calendar.

@raimund-schluessler
Member
raimund-schluessler commented Jul 28, 2016 edited

I also tried php occ dav:sync-birthday-calendar with no success.

Edit: After deleting the birthday-calendar and running the above command again, it is created correctly.

Can we automate this process, so that the birthday calendar is cleanly regenerated during upgrade?

@DeepDiver1975
Member

I will add a repair step to adjust this for existing birthday calendars

@raimund-schluessler

Great, thanks!
👍

@DeepDiver1975 DeepDiver1975 self-assigned this Jul 29, 2016
@PVince81
Collaborator

@georgehrke second review ?

@georgehrke georgehrke and 1 other commented on an outdated diff Aug 16, 2016
apps/dav/lib/CalDAV/BirthdayService.php
@@ -108,6 +108,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,VTODO',
@georgehrke
georgehrke Aug 16, 2016 edited Contributor

Why is this VEVENT,VTODO and not just VEvent?

@DeepDiver1975
DeepDiver1975 Aug 18, 2016 Member

THX for the hint

DeepDiver1975 added some commits Jul 28, 2016
@DeepDiver1975 DeepDiver1975 The birthday calendar can only hold VEVENT - refs owncloud/tasks#338 cf8c74a
@DeepDiver1975 DeepDiver1975 Adding repair step to fix component of birthday calendars
dbdf510
@DeepDiver1975
Member

jenkins is green on this one @PVince81 @butonic merge? THX

@butonic
Member
butonic commented Sep 7, 2016

👍

@PVince81 PVince81 merged commit 038020d into master Sep 7, 2016

3 of 5 checks passed

VersionEye Some dependencies have no license.
Details
continuous-integration/jenkins/pr This commit is being built
Details
Scrutinizer 4 updated code elements
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
licence/cla Contributor License Agreement is signed.
Details
@PVince81 PVince81 deleted the fix-birthday-calendar-component branch Sep 7, 2016
@DeepDiver1975 DeepDiver1975 added a commit that referenced this pull request Sep 7, 2016
@PVince81 @DeepDiver1975 PVince81 + DeepDiver1975 [stable9.1] Merge pull request #25636 from owncloud/fix-birthday-cale…
…ndar-component

The birthday calendar can only hold VEVENT
57f90dd
@DeepDiver1975 DeepDiver1975 added a commit that referenced this pull request Sep 22, 2016
@PVince81 @DeepDiver1975 PVince81 + DeepDiver1975 [stable9.1] Merge pull request #25636 from owncloud/fix-birthday-cale…
…ndar-component

The birthday calendar can only hold VEVENT
71b3e78
@DeepDiver1975 DeepDiver1975 added a commit that referenced this pull request Sep 30, 2016
@DeepDiver1975 DeepDiver1975 [stable9.1] Merge pull request #25636 from owncloud/fix-birthday-cale…
…ndar-component (#26056)

The birthday calendar can only hold VEVENT
ebf8a02
@thommierother

This issue still seems to be present on 9.1.4 with a calendar created in 9.1.3 See also owncloud/tasks#378. It makes the adding of new tasks unsuccessful, at least for users who are not able to de-select "birthdays" and select the real calendar before entering a new task (>> bad navigation in UI).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment