Fix duration changed to end date after you click apply.

This commit is contained in:
Nathan Gray 2015-10-14 15:21:22 +00:00
parent 6d23eb2368
commit e45b6471e7

View File

@ -730,7 +730,7 @@ class calendar_uiforms extends calendar_ui
{ {
$event['end'] = $event['start'] + $event['end'] - $actual_date; $event['end'] = $event['start'] + $event['end'] - $actual_date;
} }
//echo "<p>".__LINE__.": event[start]=$event[start]=".egw_time::to($event['start']).", duration=$content[duration], event[end]=$event[end]=".egw_time::to($event['end']).", offset=$offset</p>\n"; //error_log(__LINE__.": event[start]=$event[start]=".egw_time::to($event['start']).", duration=$content[duration], event[end]=$event[end]=".egw_time::to($event['end']).", offset=$offset\n");
$event['participants'] = $old_event['participants']; $event['participants'] = $old_event['participants'];
foreach ($old_event['recur_exception'] as $key => $exdate) foreach ($old_event['recur_exception'] as $key => $exdate)
{ {
@ -919,8 +919,10 @@ class calendar_uiforms extends calendar_ui
// For new events, make sure we have the whole event, not just form data // For new events, make sure we have the whole event, not just form data
$event = $this->bo->read($event['id']); $event = $this->bo->read($event['id']);
} }
$this->to_client($event); // Copy, so as to not change things for subsequent processing
$response->call('egw.dataStoreUID','calendar::'.$event['id'],$event); $converted = $event;
$this->to_client($converted);
$response->call('egw.dataStoreUID','calendar::'.$converted['id'],$converted);
} }
$msg = $message . ($msg ? ', ' . $msg : ''); $msg = $message . ($msg ? ', ' . $msg : '');