extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-18 20:51:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar: fixed deleting exceptions while editing a series

Browse Source
This commit is contained in:
Ralf Becker 2015-02-06 09:48:09 +00:00
parent 91d0853a6b
commit a8ba68d695
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -218,6 +218,8 @@ class calendar_uiforms extends calendar_ui
if ($content['recur_exception']['delete_exception']) if ($content['recur_exception']['delete_exception'])
{ {
list($date) = each($content['recur_exception']['delete_exception']); list($date) = each($content['recur_exception']['delete_exception']);
// eT2 converts time to
if (!is_numeric($date)) $date = egw_time::to (str_replace('Z','', $date), 'ts');
unset($content['recur_exception']['delete_exception']); unset($content['recur_exception']['delete_exception']);
if (($key = array_search($date,$content['recur_exception'])) !== false) if (($key = array_search($date,$content['recur_exception'])) !== false)
{ {
@ -1475,6 +1477,11 @@ class calendar_uiforms extends calendar_ui
"+'&exec[event_id]=".$content['id']."'"."+'&exec[show_conflict]=". "+'&exec[event_id]=".$content['id']."'"."+'&exec[show_conflict]=".
(($this->cal_prefs['defaultresource_sel'] == 'resources_without_conflict')? '0':'1')."'"; (($this->cal_prefs['defaultresource_sel'] == 'resources_without_conflict')? '0':'1')."'";
} }
// check if current pref. is an allowed application for the user
if (!isset($GLOBALS['egw_info']['user']['apps'][$content['participants']['resource']['default_sel']]))
{
$content['participants']['resource']['default_sel'] = 'home-accounts';
}
} }
$content['participants']['status_date'] = $preserv['actual_date']; $content['participants']['status_date'] = $preserv['actual_date'];
$preserv = array_merge($preserv,$content); $preserv = array_merge($preserv,$content);