From 70916b8fe320e89818d1288667749a7e781af706 Mon Sep 17 00:00:00 2001 From: nathan Date: Tue, 4 Apr 2023 08:39:10 -0600 Subject: [PATCH] Calendar: fix update after delete does not show new events Deleting the event caused a "hole" in daywise ID list, and trying to load that event's data failed. --- calendar/js/et2_widget_daycol.ts | 4 ++++ calendar/js/et2_widget_planner.ts | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/calendar/js/et2_widget_daycol.ts b/calendar/js/et2_widget_daycol.ts index 4e9bbeb783..ec31040895 100644 --- a/calendar/js/et2_widget_daycol.ts +++ b/calendar/js/et2_widget_daycol.ts @@ -380,6 +380,10 @@ export class et2_calendar_daycol extends et2_valueWidget implements et2_IDetache { let event : any = egw.dataGetUIDdata('calendar::' + event_ids[i]); event = event && event.data || false; + if(!event) + { + continue; + } waitForGroups.push(((this.getInstanceManager().app_obj.calendar)._fetch_group_members(event)).then(() => { if(event && event.date && et2_calendar_event.owner_check(event, this) && ( diff --git a/calendar/js/et2_widget_planner.ts b/calendar/js/et2_widget_planner.ts index c3d7d3c2a8..bfc174d7b0 100644 --- a/calendar/js/et2_widget_planner.ts +++ b/calendar/js/et2_widget_planner.ts @@ -1916,7 +1916,11 @@ export class et2_calendar_planner extends et2_calendar_view implements et2_IDeta { for(var i = 0; i < data.length; i++) { - var event = egw.dataGetUIDdata('calendar::' + data[i]); + let event = egw.dataGetUIDdata('calendar::' + data[i]); + if(!event || !event.data) + { + continue; + } waitForGroups.push((app.calendar)._fetch_group_members(event.data)); }