extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 12:39:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix original event stays when a series exception is created

Browse Source
This commit is contained in:
nathangray 2016-05-16 15:56:08 -06:00
parent 2976d910db
commit f1b4367181
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -702,6 +702,13 @@ class calendar_uiforms extends calendar_ui
unset($recur_event['alarm']); // unsetting alarms too, as they cant be updated without start! unset($recur_event['alarm']); // unsetting alarms too, as they cant be updated without start!
$this->bo->update($recur_event,true); // no conflict check here $this->bo->update($recur_event,true); // no conflict check here
if(Api\Json\Response::isJSONResponse())
{
// Sending null will trigger a removal of the original
// for that date
Api\Json\Response::get()->generic('data', array('uid' => 'calendar::'.$content['reference'].':'.$content['actual_date'], 'data' => null));
}
unset($recur_event); unset($recur_event);
unset($event['edit_single']); // if we further edit it, it's just a single event unset($event['edit_single']); // if we further edit it, it's just a single event
unset($preserv['edit_single']); unset($preserv['edit_single']);
@ -2625,6 +2632,10 @@ class calendar_uiforms extends calendar_ui
unset($recur_event['start']); unset($recur_event['end']); // no update necessary unset($recur_event['start']); unset($recur_event['end']); // no update necessary
unset($recur_event['alarm']); // unsetting alarms too, as they cant be updated without start! unset($recur_event['alarm']); // unsetting alarms too, as they cant be updated without start!
$this->bo->update($recur_event,true); // no conflict check here $this->bo->update($recur_event,true); // no conflict check here
// Sending null will trigger a removal of the original for that date
Api\Json\Response::get()->generic('data', array('uid' => 'calendar::'.$_eventId, 'data' => null));
unset($recur_event); unset($recur_event);
unset($event['edit_single']); // if we further edit it, it's just a single event unset($event['edit_single']); // if we further edit it, it's just a single event
unset($preserv['edit_single']); unset($preserv['edit_single']);