Skip to content

[stable31] Introduce own method for calendar unsharing - #52808

Merged
kesselb merged 2 commits into
stable31from
backport/52046/stable31
May 19, 2025
Merged

[stable31] Introduce own method for calendar unsharing#52808
kesselb merged 2 commits into
stable31from
backport/52046/stable31

Conversation

@backportbot

@backportbotbackportbotBot commented May 14, 2025

Copy link
Copy Markdown

Backport of #52046

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Amend HEAD commit to remove the line stating to skip CI

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@backportbotbackportbotBot added bug 3. to review Waiting for reviews pending documentation This pull request needs an associated documentation update labels May 14, 2025
@backportbotbackportbotBot added this to the Nextcloud 31.0.5 milestone May 14, 2025
@kesselb
kesselbforce-pushed the backport/52046/stable31 branch from 91157d5 to 17cb524CompareMay 15, 2025 09:07
@kesselb

Copy link
Copy Markdown
Contributor

Review and resolve any conflicts

New commands and sorting caused conflicts in info.xml.

@kesselb
kesselbforce-pushed the backport/52046/stable31 branch from 17cb524 to 510452eCompareMay 15, 2025 10:06
@kesselb
kesselb marked this pull request as ready for review May 15, 2025 10:14
@kesselbkesselb removed the pending documentation This pull request needs an associated documentation update label May 16, 2025
@kesselb
kesselbforce-pushed the backport/52046/stable31 branch from 510452e to b1a0f82CompareMay 16, 2025 10:47
kesselb added 2 commits May 19, 2025 14:35
- Introduces a `unshare` method in `CalDavBackend` to handle user unshares.
- Implements check to determine if unshare entry is needed based on group/circle membership.
- Ensures `updateShares` is only used when the calendar owner manages shares.
- Resolves issue where unsharing a calendar as owner created an unshare entry in `oc_dav_shares`.
Related PRs:
- #43117
- #47737
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Before: Find all entries in `dav_shares` with `access = 5` for the user's principal, as well as group and circle memberships.
After: Find all entries in `dav_shares` with `access = 5` solely for the user's principal.
Future support for unsharing group or circle principals could be considered as a feature enhancement.
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@kesselb
kesselbforce-pushed the backport/52046/stable31 branch from b1a0f82 to 1313fdaCompareMay 19, 2025 12:35
@kesselb
kesselb merged commit 4ee5492 into stable31May 19, 2025
@kesselb
kesselb deleted the backport/52046/stable31 branch May 19, 2025 14:12
@kesselb

Copy link
Copy Markdown
Contributor

/backport to stable30

@nextcloud-botnextcloud-bot mentioned this pull request Jun 4, 2025
10 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviewsbug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@kesselb@ChristophWurst@skjnldsv