Repository navigation
Conversation
The filter for cancelled events from nextcloud#2819 lived in the JS widget, which is no longer used since the dashboard renders the widget from the API (4.6.0) and was removed later. The API widget never checked the status, so cancelled events showed up again (nextcloud#3226). Skip objects with STATUS:CANCELLED when looking for the next occurrence. Cancelled events and series are hidden, and if only the next occurrence of a series is cancelled, the following one is shown. Signed-off-by: Tom Mittelstädt <1583407+1358@users.noreply.github.com>
1358
requested review from
GVodyanov,
SebastianKrupinski and
tcitworld
as code owners
November 11, 2026 10:48
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
This branch has not been deployed
This file contains hidden or 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
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.
Summary
#2819 hid cancelled events on the dashboard, but only in the JS widget. Since 4.6.0 the dashboard renders the widget from the API (
CalendarWidget::getItems()), and the JS widget was removed later. The API widget does not checkSTATUS, so cancelled events show up again as if they took place (reported again in #3226 for 4.6.6).This skips objects with
STATUS:CANCELLEDwhen looking for the next occurrence:Please backport to stable6.6
Testing
testGetItemsSkipsCancelledEventsAndOccurrences, fails without the change/ocs/v2.php/apps/dashboard/api/v2/widget-items🤖 AI (if applicable)