-
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
feat: Allow shared calendars as appointment conflict calendars #6411
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #6411 +/- ##
============================================
- Coverage 23.47% 23.46% -0.02%
Complexity 453 453
============================================
Files 247 247
Lines 11722 11728 +6
Branches 2212 2212
============================================
Hits 2752 2752
- Misses 8650 8656 +6
Partials 320 320
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
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.
The app also works with 30, so a conditional logic for 30 vs 31 is necessary
Ref
Line 43 in 562e828
<nextcloud min-version="30" max-version="31" /> |
562e828
to
2182d38
Compare
@ChristophWurst Done. Please have another look. |
063e0ac
to
f6a614e
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.
Looks good otherwise.
Signed-off-by: SebastianKrupinski <[email protected]> Signed-off-by: Richard Steinmetz <[email protected]>
9f31f4d
to
c08f7d1
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.
Looks good and works. I reverted the system version initial state changes to expedite the process a bit.
The version of Nextcloud is already available int the frontend via window.OC.config.version
and doesn't need to be provided via initial state.
I wish I knew this before all the changes I made! (face palm)... Learning moment |
Resolves: #3786
Requires: nextcloud/server#48621
Summary
Adjusted "Additional calendars to check for conflicts" selection logic to list all users calendars, personal and shared to be selectable for conflicts.