diff --git a/ChangeLog b/ChangeLog index b258aa194..b00f88e5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2006-10-30 Wolfgang Sourdeau + * UI/Scheduler/UIxComponent+Agenor.m ([UIxComponent + -getICalPersonsFromValue:selectorValue]): method taken from + UIxFreeBusyUserSelector, that is shared both by + UIxFreeBusyUserSelector and UIxFreeBusyUserSelectorTable. + * SoObjects/Appointments/SOGoAppointmentFolder.m ([SOGoAppointmentFolder -fetchFields:_fieldsfromFolder:_folderfrom:_startDateto:_endDatecomponent:_component]): reverted to search algorithm to search for events happening outside 0 or 1 (at most) boundary of the timerange. diff --git a/UI/Scheduler/UIxComponent+Agenor.h b/UI/Scheduler/UIxComponent+Agenor.h index fbba88c86..c27c45d67 100644 --- a/UI/Scheduler/UIxComponent+Agenor.h +++ b/UI/Scheduler/UIxComponent+Agenor.h @@ -27,12 +27,16 @@ #include @interface UIxComponent (Agenor) + +- (NSArray *) getICalPersonsFromValue: (NSString *) selectorValue; + /* email, cn */ - (NSString *)emailForUser; - (NSString *)cnForUser; /* restrictions */ - (BOOL)isAccessRestricted; + @end #endif /* __UIxComponent_Agenor_H_ */ diff --git a/UI/Scheduler/UIxComponent+Agenor.m b/UI/Scheduler/UIxComponent+Agenor.m index 216dbc021..08320032e 100644 --- a/UI/Scheduler/UIxComponent+Agenor.m +++ b/UI/Scheduler/UIxComponent+Agenor.m @@ -27,6 +27,33 @@ @implementation UIxComponent(Agenor) +- (NSArray *) getICalPersonsFromValue: (NSString *) selectorValue +{ + NSMutableArray *persons; + NSEnumerator *uids; + NSString *uid; + AgenorUserManager *um; + + um = [AgenorUserManager sharedUserManager]; + + persons = [NSMutableArray new]; + [persons autorelease]; + + if ([selectorValue length] > 0) + { + uids = [[selectorValue componentsSeparatedByString: @","] + objectEnumerator]; + uid = [uids nextObject]; + while (uid) + { + [persons addObject: [um iCalPersonWithUid: uid]]; + uid = [uids nextObject]; + } + } + + return persons; +} + - (NSString *)emailForUser { return [[[self context] activeUser] email]; }