Skip to content
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.

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

fix public calendars #26112

Merged
merged 3 commits into from Sep 26, 2016
Merged

fix public calendars #26112

merged 3 commits into from Sep 26, 2016

Conversation

@tcitworld
Copy link
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
Copy link

mention-bot commented 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 tcitworld added the app:dav label Sep 15, 2016
*/
public function getPublishToken($calendar) {
$query = $this->db->getQueryBuilder();
$result = $query->select('publicuri')

This comment has been minimized.

Copy link
@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.

Copy link
@tcitworld

tcitworld Sep 15, 2016

Author Member

Workaround. Not the best, but only one request.

@tcitworld tcitworld force-pushed the fix-public-calendars branch to 7dc37ea Sep 15, 2016
@DeepDiver1975
Copy link
Member

DeepDiver1975 commented Sep 26, 2016

Tested - works 👍

@DeepDiver1975 DeepDiver1975 merged commit 46e8feb into master Sep 26, 2016
4 of 5 checks passed
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
@lock
Copy link

lock bot commented Aug 4, 2019

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock bot locked as resolved and limited conversation to collaborators Aug 4, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.