From 6d8a2f51c5bdedcc3237bdafb35255581ebe0e95 Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 28 Jul 2011 10:17:42 +0200 Subject: [PATCH 1/2] Fix calendar selection for new events in case default calendar is not writeable (#225) --- plugins/calendar/calendar_ui.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js index 99596346..f29ea27d 100644 --- a/plugins/calendar/calendar_ui.js +++ b/plugins/calendar/calendar_ui.js @@ -1538,12 +1538,17 @@ function rcube_calendar_ui(settings) .data('id', id); } - if (!cal.readonly && !this.selected_calendar && (!settings.default_calendar || settings.default_calendar == id)) { + if (!cal.readonly && !this.selected_calendar) { this.selected_calendar = id; rcmail.enable_command('addevent', true); } } - + + // select default calendar + if (settings.default_calendar && this.calendars[settings.default_calendar] && !this.calendars[settings.default_calendar].readonly) + this.selected_calendar = settings.default_calendar; + + // initalize the fullCalendar plugin var fc = $('#calendar').fullCalendar({ header: { From d569b020f41b7bc0b179e21830c14f9390af2f7f Mon Sep 17 00:00:00 2001 From: Thomas Broderli Date: Thu, 28 Jul 2011 11:43:35 +0200 Subject: [PATCH 2/2] Fix free-busy slot comparison --- plugins/calendar/calendar.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php index f396c23c..757bcf9c 100644 --- a/plugins/calendar/calendar.php +++ b/plugins/calendar/calendar.php @@ -1282,7 +1282,7 @@ class calendar extends rcube_plugin $status = self::FREEBUSY_FREE; foreach ($fblist as $slot) { list($from, $to, $type) = $slot; - if ($from <= $t_end && $to > $t) { + if ($from < $t_end && $to > $t) { $status = isset($type) ? $type : self::FREEBUSY_BUSY; break; }