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

Prevent duplicate CalDAV availability slots for recurring slots #29334

Merged
merged 1 commit into from
Oct 20, 2021

Conversation

ChristophWurst
Copy link
Member

@ChristophWurst ChristophWurst commented Oct 20, 2021

If there is the same time slot for more than one day, then we wrote two
recurring AVAILABILITY components before. With this patch equal blocks
are combined into one recurring component. This makes the generated
rules more compact and easier to work with.

Follow-up to #27466

How to test

  • Open /settings/user/groupware
  • Create equal timed slots for more than one day
  • Save the changes

On master: multiple AVAILABILITY slots are generated, recurring only on their respective day.

Bildschirmfoto von 2021-10-20 12-22-55

With this patch: the slots are combined and recur on all days

Bildschirmfoto von 2021-10-20 12-10-20

If there is the same time slot for more than one day, then we wrote two
recurring AVAILABILITY components before. With this patch equal blocks
are combined into one recurring component. This makes the generated
rules more compact and easier to work with.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
@ChristophWurst ChristophWurst added this to the Nextcloud 23 milestone Oct 20, 2021
@ChristophWurst ChristophWurst self-assigned this Oct 20, 2021
@ChristophWurst ChristophWurst requested review from PVince81, julien-nc and skjnldsv and removed request for a team October 20, 2021 10:19
@skjnldsv skjnldsv merged commit 49e727f into master Oct 20, 2021
@skjnldsv skjnldsv deleted the fix/dav-availability-settings-duplicate-slots branch October 20, 2021 15:38
@skjnldsv skjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Oct 20, 2021
@skjnldsv skjnldsv mentioned this pull request Oct 25, 2021
25 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish bug feature: dav integration
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants