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

fix for bug [ 1164773 ] Moving events in calendar:

Browse Source 
recur_exception was never set
This commit is contained in:
Ralf Becker 2005-03-28 08:29:07 +00:00
parent f8b10f7097
commit 00986df3bc
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
calendar/inc/class.bocalendar.inc.php
View File

@ -1098,6 +1098,14 @@
$this->send_update(MSG_ADDED,$event['participants'],'',$this->get_cached_event()); $this->send_update(MSG_ADDED,$event['participants'],'',$this->get_cached_event());
$GLOBALS['phpgw']->contenthistory->updateTimeStamp('calendar', $event['id'], 'add', time()); $GLOBALS['phpgw']->contenthistory->updateTimeStamp('calendar', $event['id'], 'add', time());
print_debug('New Event ID',$event['id']); print_debug('New Event ID',$event['id']);
// set a new recur_exception
if ($event['reference'] && (int) $l_cal['new_exception'])
{
$recur_event = $this->read_entry($event['reference']);
$recur_event['recur_exception'][] = (int) $l_cal['new_exception'];
$this->so->add_entry($recur_event);
}
} }
else else
{ {
@ -1123,7 +1131,6 @@
$this->prepare_recipients($new_event,$old_event); $this->prepare_recipients($new_event,$old_event);
} }
$date = sprintf("%04d%02d%02d",$event['start']['year'],$event['start']['month'],$event['start']['mday']);
// check if infolog is availible // check if infolog is availible
if(isset($GLOBALS['phpgw_info']['apps']['infolog']) && isset($l_cal['project'])) if(isset($GLOBALS['phpgw_info']['apps']['infolog']) && isset($l_cal['project']))
{ {
@ -1219,6 +1226,7 @@
'hour' => (int)(date('H',$time)), 'hour' => (int)(date('H',$time)),
'min' => (int)(date('i',$time)), 'min' => (int)(date('i',$time)),
'sec' => (int)(date('s',$time)), 'sec' => (int)(date('s',$time)),
'raw' => $time,
'alarm' => (int)($alarm) 'alarm' => (int)($alarm)
); );
} }

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

@ -4072,7 +4072,9 @@ return;
'common_hidden' => $this->html->input_hidden('cal[id]',$event['id']) 'common_hidden' => $this->html->input_hidden('cal[id]',$event['id'])
. $this->html->input_hidden('cal[owner]',$event['owner']) . $this->html->input_hidden('cal[owner]',$event['owner'])
. $this->html->input_hidden('cal[uid]',$event['uid']) . $this->html->input_hidden('cal[uid]',$event['uid'])
. ($_GET['cal_id'] && $event['id'] == 0?$this->html->input_hidden('cal[reference]',$_GET['cal_id']) : . ($_GET['cal_id'] && $event['id'] == 0?$this->html->input_hidden(array(
'cal[reference]' => $_GET['cal_id'],
'cal[new_exception]' => $event['start']['raw'])) :
(@isset($event['reference'])?$this->html->input_hidden('cal[reference]',$event['reference']):'')) (@isset($event['reference'])?$this->html->input_hidden('cal[reference]',$event['reference']):''))
. (@isset($GLOBALS['phpgw_info']['server']['deny_user_grants_access']) && $GLOBALS['phpgw_info']['server']['deny_user_grants_access']? . (@isset($GLOBALS['phpgw_info']['server']['deny_user_grants_access']) && $GLOBALS['phpgw_info']['server']['deny_user_grants_access']?
$this->html->input_hidden('participants[]',$this->bo->owner):''), $this->html->input_hidden('participants[]',$this->bo->owner):''),