-
Notifications
You must be signed in to change notification settings - Fork 241
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
Allow any calendar the user has access to, to be selected for the 'conflict calendar' #5934
base: main
Are you sure you want to change the base?
Conversation
5de6393
to
190e869
Compare
Hello there, We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process. Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6 Thank you for contributing to Nextcloud and we hope to hear from you soon! |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #5934 +/- ##
============================================
- Coverage 23.67% 23.67% -0.01%
Complexity 457 457
============================================
Files 249 249
Lines 11774 11778 +4
Branches 2203 2204 +1
============================================
Hits 2788 2788
- Misses 8669 8673 +4
Partials 317 317
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
…he 'conflict' calendar Signed-off-by: Patrick Robertson <[email protected]> Signed-off-by: Richard Steinmetz <[email protected]>
fc98cfd
to
67d1435
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tested this and the frontend parts work. However, incoming shared calendars are not considered by the backend when calculating slots during booking.
The CalDAV backend inside server code has to be changed to fix this as far as I can see.
Conflict calendars are queried from the backend by their URIs but shared calendars are stored in another table oc_dav_shares
. So they won't be listed and thus no slots will be blocked by events in incoming shared (read-only) calendars
Are you sure? https://github.com/nextcloud/server/blob/9d4b9440986afddc28dad99c7987f9c31513ae9f/apps/dav/lib/CalDAV/CalendarProvider.php#L37 should already search shared calendars |
This is an attempted fix for #3786
Any calendar should be selectable for the 'conflict calendars', even if the user doesn't have write access to it. (e.g. a company has a 'holidays' calendar that a user should be able to select for conflicts.