extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 00:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix drag and drop series exception in a different timezone did not remove original event

Browse Source
This commit is contained in:
Nathan Gray 2015-12-16 00:28:56 +00:00
parent 67652ccaf1
commit 4aed504622
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/inc/class.calendar_bo.inc.php
View File

@ -867,7 +867,7 @@ class calendar_bo
}
else
{
$timestamps = array('start','end','modified','created','recur_enddate','recurrence');
$timestamps = array('start','end','modified','created','recur_enddate','recurrence','recur_date');
}
// we convert here from the server-time timestamps to user-time and (optional) to a different date-format!
foreach ($timestamps as $ts)

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

@ -814,7 +814,7 @@ class calendar_ui
if ($event['recur_type'] != MCAL_RECUR_NONE)
{
$event['app_id'] .= ':'.($event['recur_date'] ? $event['recur_date'] : $event['start']);
$event['app_id'] .= ':'.egw_time::to($event['recur_date'] ? $event['recur_date'] : $event['start'],'ts');
}
$event['parts'] = implode(",\n",$this->bo->participants($event,false));
$event['date'] = $this->bo->date2string($event['start']);

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

@ -2683,7 +2683,7 @@ foreach($recur_event as $_k => $_v) error_log($_k . ': ' . array2string($_v));
*/
function ajax_moveEvent($_eventId,$calendarOwner,$targetDateTime,$targetOwner,$durationT=null,$seriesInstance=null)
{
list($eventId, $date) = explode(':', $_eventId);
list($eventId, $date) = explode(':', $_eventId,2);
// we do not allow dragging into another users calendar ATM
if($targetOwner < 0)
@ -2744,7 +2744,7 @@ foreach($recur_event as $_k => $_v) error_log($_k . ': ' . array2string($_v));
{
// now we need to add the original start as recur-execption to the series
$recur_event = $this->bo->read($event['reference']);
$recur_event['recur_exception'][] = $date;
$recur_event['recur_exception'][] = $d->format('ts');
// check if we need to move the alarms, because they are next on that exception
foreach($recur_event['alarm'] as $id => $alarm)
{

2
calendar/inc/class.calendar_uilist.inc.php
View File

@ -463,7 +463,7 @@ class calendar_uilist extends calendar_ui
}
// set id for grid
$event['row_id'] = $event['id'].($event['recur_type'] ? ':'.($event['recur_date'] ? $event['recur_date'] : $event['start']) : '');
$event['row_id'] = $event['id'].($event['recur_type'] ? ':'.egw_time::to($event['recur_date'] ? $event['recur_date'] : $event['start'],'ts') : '');
// Format start and end with timezone
foreach(array('start','end') as $time)