extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-28 02:43:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar: If an event went from recurring to non-recurring, recurring events could still be displayed

Browse Source
This commit is contained in:
nathan 2022-11-25 09:24:04 -07:00 committed by ralf
parent 0ab30a1b3a
commit e9b6553ab4
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
calendar/inc/class.calendar_ui.inc.php
View File

@ -690,10 +690,10 @@ class calendar_ui
if(!$event['recur_type'] || $recurrence_date)
{
$this->to_client($event);
$response->generic('data', array('uid' => 'calendar::'.$event['row_id'], 'data' => $event));
$response->generic('data', array('uid' => 'calendar::' . $event['row_id'], 'data' => $event));
}
// If it's recurring, try to send the next month or so
else if($event['recur_type'] )
// If it is (or was) recurring, try to send the next month or so
if($event['recur_type'] || (!$event['recur_type'] && $old_event['recur_type']))
{
$this_month = new Api\DateTime('next month');
$data = [];
@ -711,17 +711,20 @@ class calendar_ui
}
while($old_rrule->valid() && $occurrence <= $this_month);
}
$rrule = calendar_rrule::event2rrule($event, true);
$rrule->rewind();
do
if($event['recur_type'])
{
$occurrence = $rrule->current();
$converted = $this->bo->read($event['id'], $occurrence);
$this->to_client($converted);
$data['calendar::' . $converted['row_id']] = $converted;
$rrule->next();
$rrule = calendar_rrule::event2rrule($event, true);
$rrule->rewind();
do
{
$occurrence = $rrule->current();
$converted = $this->bo->read($event['id'], $occurrence);
$this->to_client($converted);
$data['calendar::' . $converted['row_id']] = $converted;
$rrule->next();
}
while($rrule->valid() && $occurrence <= $this_month);
}
while($rrule->valid() && $occurrence <= $this_month);
// Now we have to go through and send each one individually, since client side data can't handle more than one
foreach($data as $uid => $cal_data)