mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-04-05 05:18:51 +00:00
Monotone-Parent: 9592640aebbff2d0647f3a04e1afca2b9579d1ba
Monotone-Revision: 38b9ad0f82da6f3240df35e97f591af056f15769 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-06-01T04:08:19 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
@@ -1,5 +1,10 @@
|
||||
2007-06-01 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* SoObjects/Appointments/SOGoAppointmentObject.m
|
||||
([SOGoAppointmentObject
|
||||
-saveContentString:contentStringbaseVersion:baseVersion]): remove
|
||||
method since an event may not have an organizer.
|
||||
|
||||
* SoObjects/SOGo/SOGoObject.m ([SOGoObject
|
||||
-GETAction:localContext]): clarified method. Added support for
|
||||
content-type (thanks to Helge Hess).
|
||||
|
||||
@@ -410,7 +410,7 @@
|
||||
|
||||
/* perform */
|
||||
|
||||
return [self deleteInUIDs:removedUIDs];
|
||||
return [self deleteInUIDs: removedUIDs];
|
||||
}
|
||||
|
||||
- (NSException *) saveContentString: (NSString *) _iCalString
|
||||
@@ -425,35 +425,4 @@
|
||||
return @"IPM.Appointment";
|
||||
}
|
||||
|
||||
- (NSException *) saveContentString: (NSString *) contentString
|
||||
baseVersion: (unsigned int) baseVersion
|
||||
{
|
||||
NSString *newContentString, *oldContentString;
|
||||
iCalCalendar *eventCalendar;
|
||||
iCalEvent *event;
|
||||
iCalPerson *organizer;
|
||||
NSArray *organizers;
|
||||
|
||||
oldContentString = [self contentAsString];
|
||||
if (oldContentString)
|
||||
newContentString = contentString;
|
||||
else
|
||||
{
|
||||
eventCalendar = [iCalCalendar parseSingleFromSource: contentString];
|
||||
event = (iCalEvent *) [eventCalendar firstChildWithTag: [self componentTag]];
|
||||
organizers = [event childrenWithTag: @"organizer"];
|
||||
if ([organizers count])
|
||||
newContentString = contentString;
|
||||
else
|
||||
{
|
||||
organizer = [self iCalPersonWithUID: [self ownerInContext: context]];
|
||||
[event setOrganizer: organizer];
|
||||
newContentString = [eventCalendar versitString];
|
||||
}
|
||||
}
|
||||
|
||||
return [super saveContentString: newContentString
|
||||
baseVersion: baseVersion];
|
||||
}
|
||||
|
||||
@end /* SOGoAppointmentObject */
|
||||
|
||||
Reference in New Issue
Block a user