holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Calendar: Fix some cases where a changed participant status would not remove the event when it should

Browse Source
This commit is contained in:
nathangray 2020-03-12 09:18:30 -06:00
parent 7557153226
commit fc296f3ed1
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,10 +11,10 @@
*/ */
use EGroupware\Api; use EGroupware\Api;
use EGroupware\Api\Framework;
use EGroupware\Api\Egw;
use EGroupware\Api\Acl; use EGroupware\Api\Acl;
use EGroupware\Api\Egw;
use EGroupware\Api\Etemplate; use EGroupware\Api\Etemplate;
use EGroupware\Api\Framework;
/** /**
* Shared base-class of all calendar UserInterface classes * Shared base-class of all calendar UserInterface classes
@ -667,7 +667,12 @@ class calendar_ui
if(!$event || !$filter_match) if(!$event || !$filter_match)
{ {
// Sending null will trigger a removal // Sending null will trigger a removal
$response->generic('data', array('uid' => 'calendar::'.$event_id, 'data' => null)); $uid = 'calendar::' . $event_id;
if ($recurrence_date)
{
$uid .= ':' . $recurrence_date->getTimestamp();
}
$response->generic('data', array('uid' => $uid, 'data' => null));
return false; return false;
} }