fix public calendars #26112

Merged
merged 3 commits into from Sep 26, 2016

Conversation

Projects
None yet
3 participants
@tcitworld
Member

tcitworld commented Sep 14, 2016

Description

Makes public calendars work properly again.

I have made that quite simply, but maybe it's better to wrap this all in a PublicCalendar class ?

Related Issue

#22735

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@tcitworld tcitworld added this to the 9.2 milestone Sep 14, 2016

@mention-bot

This comment has been minimized.

Show comment
Hide comment
@mention-bot

mention-bot Sep 14, 2016

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

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

@tcitworld tcitworld added the app:dav label Sep 15, 2016

apps/dav/lib/CalDAV/CalDavBackend.php
+ */
+ public function getPublishToken($calendar) {
+ $query = $this->db->getQueryBuilder();
+ $result = $query->select('publicuri')

This comment has been minimized.

@DeepDiver1975

DeepDiver1975 Sep 15, 2016

Member

I'd prefer to add this to the overall loading query where we already join calendar table with the shares table

@DeepDiver1975

DeepDiver1975 Sep 15, 2016

Member

I'd prefer to add this to the overall loading query where we already join calendar table with the shares table

This comment has been minimized.

@tcitworld

tcitworld Sep 15, 2016

Member

Workaround. Not the best, but only one request.

@tcitworld

tcitworld Sep 15, 2016

Member

Workaround. Not the best, but only one request.

tcitworld added some commits Sep 15, 2016

@DeepDiver1975

This comment has been minimized.

Show comment
Hide comment
@DeepDiver1975

DeepDiver1975 Sep 26, 2016

Member

Tested - works 👍

Member

DeepDiver1975 commented Sep 26, 2016

Tested - works 👍

@DeepDiver1975 DeepDiver1975 merged commit 46e8feb into master Sep 26, 2016

4 of 5 checks passed

VersionEye Some dependencies have no license.
Details
Scrutinizer No new issues
Details
continuous-integration/jenkins/pr-head This commit looks good
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
licence/cla Contributor License Agreement is signed.
Details

@DeepDiver1975 DeepDiver1975 deleted the fix-public-calendars branch Sep 26, 2016

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