mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-10-11 14:57:12 +00:00
propagate from branch 'ca.inverse.sogo.1_3_12' (head f5ba6db440f5a8ba817af65dea12b4a616fdfe71)
to branch 'ca.inverse.sogo' (head df5dd81d62db331ba5c8de9f2257f9430c586534) Monotone-Parent: df5dd81d62db331ba5c8de9f2257f9430c586534 Monotone-Parent: f5ba6db440f5a8ba817af65dea12b4a616fdfe71 Monotone-Revision: 31373520d86c320c1658f22e3bde2eee178c2003 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-01-09T16:38:18 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
commit
5468b9b1a2
11 files changed
+141
-68
No files matched your search
@@ -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",
|
||||
|
||||
Reference in new issue
Block a user