Monotone-Parent: 1bc4da9c10aec9ded2d443f77aedb8ceeaaf7ce8
Monotone-Revision: 006ff807d8307c52defea735313008dfe94862db Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-08-19T14:48:30 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
0bede69b36
commit
92a24808bd
|
@ -1,3 +1,9 @@
|
|||
2008-08-19 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* UI/Scheduler/UIxAppointmentEditor.m ([UIxAppointmentEditor
|
||||
-viewAction]): apply the user's timezone to the startdate before
|
||||
formatting it.
|
||||
|
||||
2008-08-18 Ludovic Marcotte <lmarcotte@inverse.ca>
|
||||
|
||||
* SoObjects/Mailer/SOGoDraftObject.m ([SOGoDraftObject
|
||||
|
|
|
@ -37,11 +37,11 @@
|
|||
#import <NGCards/iCalPerson.h>
|
||||
#import <NGCards/iCalRecurrenceRule.h>
|
||||
|
||||
#import <SoObjects/SOGo/NSDictionary+Utilities.h>
|
||||
#import <SoObjects/SOGo/SOGoUser.h>
|
||||
#import <SoObjects/SOGo/SOGoDateFormatter.h>
|
||||
#import <SoObjects/SOGo/SOGoContentObject.h>
|
||||
#import <SoObjects/Appointments/SOGoAppointmentFolder.h>
|
||||
#import <SoObjects/Appointments/SOGoAppointmentsFolder.h>
|
||||
#import <SoObjects/Appointments/SOGoAppointmentObject.h>
|
||||
|
||||
#import <SoObjects/Appointments/SOGoComponentOccurence.h>
|
||||
|
@ -272,28 +272,33 @@
|
|||
|
||||
- (id <WOActionResults>) viewAction
|
||||
{
|
||||
id <WOActionResults> result;
|
||||
WOResponse *result;
|
||||
NSDictionary *data;
|
||||
SOGoAppointmentFolder *co;
|
||||
SOGoDateFormatter *dateFormatter;
|
||||
SOGoUser *user;
|
||||
NSCalendarDate *startDate;
|
||||
|
||||
result = [context response];
|
||||
user = [context activeUser];
|
||||
co = [self clientObject];
|
||||
dateFormatter = [user dateFormatterInContext: context];
|
||||
|
||||
[self event];
|
||||
startDate = [[event startDate] copy];
|
||||
[startDate setTimeZone: [user timeZone]];
|
||||
|
||||
data = [NSDictionary dictionaryWithObjectsAndKeys:
|
||||
[dateFormatter formattedDate: [event startDate]], @"startDate",
|
||||
[dateFormatter formattedTime: [event startDate]], @"startTime",
|
||||
([event hasRecurrenceRules]?@"1":@"0"), @"isReccurent",
|
||||
([event isAllDay]?@"1":@"0"), @"isAllDay",
|
||||
[dateFormatter formattedDate: startDate], @"startDate",
|
||||
[dateFormatter formattedTime: startDate], @"startTime",
|
||||
([event hasRecurrenceRules]? @"1": @"0"), @"isReccurent",
|
||||
([event isAllDay] ? @"1": @"0"), @"isAllDay",
|
||||
[event summary], @"summary",
|
||||
[event location], @"location",
|
||||
[event comment], @"description",
|
||||
nil];
|
||||
[(WOResponse*)result appendContentString: [data jsonRepresentation]];
|
||||
[result appendContentString: [data jsonRepresentation]];
|
||||
[startDate release];
|
||||
|
||||
return result;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue