Monotone-Parent: 2d1ca1ccfa858d6badd46ed9adcc4f390f22125b

Monotone-Revision: 4f3f7bdb86b48a58239e187db6765aa85a571d56

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-02-16T16:55:48
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-02-16 16:55:48 +00:00
parent 900c469e39
commit bce1177499
2 changed files with 14 additions and 1 deletions
+4
View File
@@ -1,5 +1,9 @@
2007-02-16 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoUser.m ([SOGoUser
-rolesForObject:objectinContext:context]): test for
"rolesOfUser:inContext:" in addition to "roleOfUser:...".
* SoObjects/Appointments/SOGoCalendarComponent.m
([SOGoCalendarComponent -rolesOfUser:logininContext:context]):
returns the roles of the user on the container object if the event
+10 -1
View File
@@ -30,6 +30,8 @@
- (NSString *) roleOfUser: (NSString *) uid
inContext: (WOContext *) context;
- (NSArray *) rolesOfUser: (NSString *) uid
inContext: (WOContext *) context;
@end
@@ -159,7 +161,14 @@
aclsFolder = [SOGoAclsFolder aclsFolder];
sogoRoles = [aclsFolder aclsForObject: (SOGoObject *) object
forUser: login];
[rolesForObject addObjectsFromArray: sogoRoles];
if (sogoRoles)
[rolesForObject addObjectsFromArray: sogoRoles];
}
if ([object respondsToSelector: @selector (rolesOfUser:inContext:)])
{
sogoRoles = [object rolesOfUser: login inContext: context];
if (sogoRoles)
[rolesForObject addObjectsFromArray: sogoRoles];
}
if ([object respondsToSelector: @selector (roleOfUser:inContext:)])
{