From a8ba68d695bf8e7003cacc37327933070b0b7463 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 6 Feb 2015 09:48:09 +0000 Subject: [PATCH] * Calendar: fixed deleting exceptions while editing a series --- calendar/inc/class.calendar_uiforms.inc.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php index 04c637ce10..9914d39ab0 100644 --- a/calendar/inc/class.calendar_uiforms.inc.php +++ b/calendar/inc/class.calendar_uiforms.inc.php @@ -218,6 +218,8 @@ class calendar_uiforms extends calendar_ui if ($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']); 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]=". (($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']; $preserv = array_merge($preserv,$content);