Skip to content

[stable32] fix: access shared and delegated trashbin objects#60966

Draft
backportbot[bot] wants to merge 2 commits into
stable32from
backport/60648/stable32
Draft

[stable32] fix: access shared and delegated trashbin objects#60966
backportbot[bot] wants to merge 2 commits into
stable32from
backport/60648/stable32

Conversation

@backportbot

@backportbot backportbot Bot commented Jun 3, 2026

Copy link
Copy Markdown

Backport of #60648

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

Todo

  • Review and resolve any conflicts
  • Review and verify the backported changes
  • 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.

fix: access shared trashbin objects

Signed-off-by: Hamza <hamzamahjoubi221@gmail.com>

Assisted-by: claude:Opus 4.7 (1M context)

[skip ci]
@backportbot backportbot Bot added bug 3. to review Waiting for reviews feature: caldav Related to CalDAV internals labels Jun 3, 2026
@backportbot backportbot Bot added this to the Nextcloud 32.0.12 milestone Jun 3, 2026
Restore the hunks missing from the original backport of #60648:
- replace the legacy owned-calendars result loop in
  collectDeletedCalendarObjectsForPrincipal() which clobbered the
  by-reference accumulator and skipped the delegated-calendar URI logic
- add the missing canModify()/isShared() permission helpers and the
  getSourceCalendarUri()/getCalendarPrincipalUri()/getDelegator()
  getters used by the trashbin plugin

Also adapt fetchAssociative() to fetch() since IResult on stable32
does not expose fetchAssociative().

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Signed-off-by: Hamza <hamzamahjoubi221@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review Waiting for reviews bug feature: caldav Related to CalDAV internals

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant