Monotone-Parent: 617fa1501ed731ebbd3ccbe493d88a1bc0a7fd02

Monotone-Revision: 7a59198f4742259b4e227285ce7009dcd7fff7e0

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-05-19T00:49:05
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,5 +1,10 @@
 2007-05-18  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoFolder.m ([SOGoFolder
+	-aclUsersForObjectAtPath:objectPathArray]): new method that being
+	forwarded the calles to aclUsers for the GCS-based subclasses of
+	SOGoObject.
+
 	* SoObjects/Mailer/SOGoMailFolder.m: removed all the previous
 	methods that would have been used to support IMAP acls. Replaced
 	them with the new protocol for them that has been implemented in

SoObjects/SOGo/SOGoFolder.h

@@ -72,7 +72,7 @@
 - (NSException *) delete;
 
 /* acls as a container */
-- (NSArray *) aclsForObjectAtPath: (NSArray *) objectPathArray;
+- (NSArray *) aclUsersForObjectAtPath: (NSArray *) objectPathArray;
 - (NSArray *) aclsForUser: (NSString *) uid
           forObjectAtPath: (NSArray *) objectPathArray;
 - (void) setRoles: (NSArray *) roles

SoObjects/SOGo/SOGoFolder.m

@@ -266,16 +266,18 @@
 
 /* acls as a container */
 
-- (NSArray *) aclsForObjectAtPath: (NSArray *) objectPathArray;
+- (NSArray *) aclUsersForObjectAtPath: (NSArray *) objectPathArray;
 {
   EOQualifier *qualifier;
   NSString *qs;
+  NSArray *records;
 
   qs = [NSString stringWithFormat: @"c_object = '/%@'",
 		 [objectPathArray componentsJoinedByString: @"/"]];
   qualifier = [EOQualifier qualifierWithQualifierFormat: qs];
+  records = [[self ocsFolder] fetchAclMatchingQualifier: qualifier];
 
-  return [[self ocsFolder] fetchAclMatchingQualifier: qualifier];
+  return [records valueForKey: @"c_uid"];
 }
 
 - (NSArray *) _fetchAclsForUser: (NSString *) uid
@@ -424,9 +426,9 @@
   return nil;
 }
 
-- (NSArray *) acls
+- (NSArray *) aclUsers
 {
-  return [self aclsForObjectAtPath: [self pathArrayToSoObject]];
+  return [self aclUsersForObjectAtPath: [self pathArrayToSoObject]];
 }
 
 - (NSArray *) aclsForUser: (NSString *) uid
@@ -449,6 +451,11 @@
                forObjectAtPath: [self pathArrayToSoObject]];
 }
 
+- (BOOL) hasSupportForDefaultRoles
+{
+  return YES;
+}
+
 /* WebDAV */
 
 - (BOOL) davIsCollection