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

* Calendar: added deleted timestamp to history, to be able to see who deleted an event and when

Browse Source
This commit is contained in:
Ralf Becker 2015-05-26 18:34:03 +00:00
parent aff68492e1
commit 01143f4b76
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,6 +59,7 @@ class calendar_tracking extends bo_tracking
'start' => 'start',
'end' => 'end',
'deleted' => 'deleted',
'participants' => array('user_id', 'status', 'role', 'recur'),
'participants-c' => array('user_id', 'status', 'quantity', 'role', 'recur'),
@ -86,6 +87,7 @@ class calendar_tracking extends bo_tracking
'start' => 'start',
'end' => 'end',
'deleted' => 'deleted',
'participants' => 'Participants: User, Status, Role',
'participants-c'=> 'Participants: User, Status, Quantity, Role',

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

@ -2430,6 +2430,8 @@ class calendar_uiforms extends calendar_ui
'start' => 'date-time',
'end' => 'date-time',
'deleted' => 'date-time',
'tz_id' => 'select-timezone',
// Participants
@ -2560,7 +2562,7 @@ class calendar_uiforms extends calendar_ui
}
}
}
/**
* imports a mail as Calendar
*
@ -2576,13 +2578,13 @@ class calendar_uiforms extends calendar_ui
egw_link::get_data ($_GET['egw_data']);
return false;
}
if (is_array($mailContent))
{
// Addressbook
$AB = new addressbook_bo();
$accounts = array(0 => $GLOBALS['egw_info']['user']['account_id']);
$participants[0] = array (
'uid' => $GLOBALS['egw_info']['user']['account_id'],
'delete_id' => $GLOBALS['egw_info']['user']['account_id'],
@ -2620,7 +2622,7 @@ class calendar_uiforms extends calendar_ui
"role" => "REQ-PARTICIPANT",
"add" => "pressed"
));
// Prepare calendar event draft
$event = array(
'title' => $mailContent['subject'],
@ -2633,7 +2635,7 @@ class calendar_uiforms extends calendar_ui
'start' => $mailContent['date'],
'duration' => 60 * $this->cal_prefs['interval']
);
if (is_array($mailContent['attachments']))
{
foreach ($mailContent['attachments'] as $attachment)
@ -2653,7 +2655,7 @@ class calendar_uiforms extends calendar_ui
{
egw_framework::window_close(lang('No content found to show up as calendar entry.'));
}
return $this->process_edit($event);
}
}