Expose calendar-uri as property of deleted caldav events #27310
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The trashbin is one report across all calendars of a user. In order to refresh the data of a single calendar when one of its events is restored, we need to know what calendar the event belongs to. There doesn't seem to be a standard property for a URI, so this adds a custom Nextcloud prop for the calendar-uri. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
ChristophWurst
requested review from
altima,
st3iny,
tcitworld,
kesselb and
GretaD
skjnldsv
approved these changes
May 31, 2021
ChristophWurst
deleted the
enhancement/caldav-trashbin-objects-calendar-id
branch
ChristophWurst
commented
May 31, 2021
| @@ -1111,10 +1112,11 @@ public function getDeletedCalendarObjectsByPrincipal(string $principalUri): arra | |||
| while ($row = $stmt->fetch()) { | |||
| $result[] = [ | |||
| 'id' => $row['id'], | |||
| 'uri' => $row['uri'], | |||
| 'uri' => $row['co.uri'], | |||
There was a problem hiding this comment.
this was a mistake #27311 :)
ChristophWurst
commented
May 31, 2021
| @@ -2153,10 +2156,11 @@ public function getCalendarObjectById(string $principalUri, int $id): ?array { | |||
|
|
|||
| return [ | |||
| 'id' => $row['id'], | |||
| 'uri' => $row['uri'], | |||
| 'uri' => $row['c.uri'], | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The trashbin is one report across all calendars of a user. In order to
refresh the data of a single calendar when one of its events is
restored, we need to know what calendar the event belongs to. There
doesn't seem to be a standard property for a URI, so this adds a custom
Nextcloud prop for the calendar-uri.
Required for nextcloud/calendar#3118.