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

- Fix deleting series with multiple events in series selected

Browse Source 
- Fix un-deleting series only restored after selected event
This commit is contained in:
Nathan Gray 2013-01-15 20:06:52 +00:00
parent b1484c2a1d
commit a23abd324b
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -559,7 +559,7 @@ class calendar_uilist extends calendar_ui
{ {
$timesheet_bo = new timesheet_bo(); $timesheet_bo = new timesheet_bo();
} }
foreach($checked as $id) foreach($checked as &$id)
{ {
$recur_date = $app = $app_id = null; $recur_date = $app = $app_id = null;
if(is_array($id) && $id['id']) if(is_array($id) && $id['id'])
@ -588,6 +588,18 @@ class calendar_uilist extends calendar_ui
if ($id && $this->bo->delete($id, $recur_date,false,$skip_notification)) if ($id && $this->bo->delete($id, $recur_date,false,$skip_notification))
{ {
$success++; $success++;
if(!$recur_date && $settings == 'series')
{
// If there are multiple events in a series selected, the next one could purge
foreach($checked as $key => $c_id)
{
list($c_id,$recur_date) = explode(':',$c_id);
if($c_id == $id)
{
unset($checked[$key]);
}
}
}
} }
else else
{ {
@ -596,6 +608,11 @@ class calendar_uilist extends calendar_ui
break; break;
case 'undelete': case 'undelete':
$action_msg = lang('recovered'); $action_msg = lang('recovered');
if($settings == 'series')
{
// unDelete the whole thing
$recur_date = 0;
}
if ($id && ($event = $this->bo->read($id, $recur_date)) && $this->bo->check_perms(EGW_ACL_EDIT,$id) && if ($id && ($event = $this->bo->read($id, $recur_date)) && $this->bo->check_perms(EGW_ACL_EDIT,$id) &&
is_array($event) && $event['deleted']) is_array($event) && $event['deleted'])
{ {