From 51cd566744027733f2ffcf862d73b36aed00a10d Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 3 Jan 2012 21:42:23 +0000 Subject: [PATCH] Monotone-Parent: 76bba460617a7f4d7ee1f66a47e8918059e6f046 Monotone-Revision: 379924109229c07d133fc063329a33e5f0dc987d Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2012-01-03T21:42:23 --- UI/Scheduler/UIxAppointmentEditor.m | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/UI/Scheduler/UIxAppointmentEditor.m b/UI/Scheduler/UIxAppointmentEditor.m index 670ae5a8c..bcac3cdfa 100644 --- a/UI/Scheduler/UIxAppointmentEditor.m +++ b/UI/Scheduler/UIxAppointmentEditor.m @@ -457,7 +457,7 @@ { WOResponse *result; NSDictionary *data; - NSCalendarDate *eventDate; + NSCalendarDate *eventStartDate, *eventEndDate; NSTimeZone *timeZone; SOGoUserDefaults *ud; SOGoCalendarComponent *co; @@ -469,8 +469,10 @@ result = [self responseWithStatus: 200]; ud = [[context activeUser] userDefaults]; timeZone = [ud timeZone]; - eventDate = [event startDate]; - [eventDate setTimeZone: timeZone]; + eventStartDate = [event startDate]; + eventEndDate = [event endDate]; + [eventStartDate setTimeZone: timeZone]; + [eventEndDate setTimeZone: timeZone]; co = [self clientObject]; if (!componentCalendar) @@ -507,8 +509,10 @@ data = [NSDictionary dictionaryWithObjectsAndKeys: [componentCalendar displayName], @"calendar", [event tag], @"component", - [dateFormatter formattedDate: eventDate], @"startDate", - [dateFormatter formattedTime: eventDate], @"startTime", + [dateFormatter formattedDate: eventStartDate], @"startDate", + [dateFormatter formattedTime: eventStartDate], @"startTime", + [dateFormatter formattedDate: eventEndDate], @"endDate", + [dateFormatter formattedTime: eventEndDate], @"endTime", ([event hasRecurrenceRules] ? @"1": @"0"), @"isRecurring", ([event isAllDay] ? @"1": @"0"), @"isAllDay", [event summary], @"summary",