VladPolskiy/nextcloud-spreed
1
0
Fork 0
mirror of https://github.com/nextcloud/spreed.git synced 2025-07-24 07:30:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15548 from nextcloud/fix/15546/check-if-event-has-status

Browse Source 
fix(dashboard): fix undefined array key 'status'
This commit is contained in:
Joas Schilling
2025-07-18 16:20:42 +02:00
committed by GitHub
parent f8b0cc2f39 e5b14a9429
commit 524be3036e
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Service/CalendarIntegrationService.php
View File

@ -107,7 +107,7 @@ class CalendarIntegrationService {
continue; continue;
} }
if ($event['STATUS'][0] === 'CANCELLED') { if (isset($event['STATUS']) && $event['STATUS'][0] === 'CANCELLED') {
continue; continue;
} }

2
tests/integration/features/integration/dashboard-talk.feature
View File

@ -13,7 +13,7 @@ Feature: integration/dashboard-talk
|dashboardRoom | 2 | dashboardRoom-attachment | null | null | null | null | 1 | 1 | |dashboardRoom | 2 | dashboardRoom-attachment | null | null | null | null | 1 | 1 |
|dashboardRoom | 2 | dashboardRoom-attendees | 1 | 1 | null | null | 0 | 1 | |dashboardRoom | 2 | dashboardRoom-attendees | 1 | 1 | null | null | 0 | 1 |
|dashboardRoom | 2 | dashboardRoom-recurring | null | null | null | null | 0 | 1 | |dashboardRoom | 2 | dashboardRoom-recurring | null | null | null | null | 0 | 1 |
|dashboardRoom | 2 | dashboardRoom-no-status | null | null | null | null | 0 | 1 |
Scenario: User gets mutual events for a one to one conversation Scenario: User gets mutual events for a one to one conversation
Given user "participant1" exists and has an email address Given user "participant1" exists and has an email address
Given user "participant2" exists and has an email address Given user "participant2" exists and has an email address

17
tests/integration/spreedcheats/calendars/5_event_no_status.txt Normal file
View File

@ -0,0 +1,17 @@
BEGIN:VCALENDAR
PRODID:-//IDN nextcloud.com//Calendar app 5.2.0-dev.1//EN
CALSCALE:GREGORIAN
VERSION:2.0
BEGIN:VEVENT
CREATED:20250310T171800Z
DTSTAMP:20250310T171819Z
LAST-MODIFIED:20250310T171819Z
SEQUENCE:2
UID:{{{UID}}}
DTSTART:{{{START}}}
DTEND:{{{END}}}
SUMMARY:{{{NAME}}}-no-status
LOCATION:{{{LOCATION}}}
DESCRIPTION:{{{NAME}}}
END:VEVENT
END:VCALENDAR