mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-08-25 16:33:22 +00:00
Monotone-Parent: c69f7f8d6e6f9e8f9e94f61cae6ed7a39e26e747
Monotone-Revision: b3c4fef061776cff263262f03c363766fa58d479 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-11-27T21:06:11 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
@@ -374,16 +374,14 @@
|
||||
containerAcls = [container aclsForUser: uid];
|
||||
if ([containerAcls count] > 0)
|
||||
{
|
||||
if ([containerAcls containsObject: SOGoRole_ObjectCreator])
|
||||
[acls addObjectsFromArray: containerAcls];
|
||||
if (isNew)
|
||||
{
|
||||
[acls addObject: SOGoRole_ObjectCreator];
|
||||
if (isNew)
|
||||
if ([containerAcls containsObject: SOGoRole_ObjectCreator])
|
||||
[acls addObject: SOGoRole_ObjectEditor];
|
||||
else
|
||||
[acls removeObject: SOGoRole_ObjectEditor];
|
||||
}
|
||||
if ([containerAcls containsObject: SOGoRole_ObjectReader])
|
||||
[acls addObject: SOGoRole_ObjectViewer];
|
||||
if ([containerAcls containsObject: SOGoRole_ObjectEditor])
|
||||
[acls addObject: SOGoRole_ObjectEditor];
|
||||
}
|
||||
|
||||
return acls;
|
||||
|
||||
@@ -596,8 +596,6 @@ static NSString *defaultUserID = @"<default>";
|
||||
containerAcls = [container aclsForUser: uid];
|
||||
if ([containerAcls count] > 0)
|
||||
{
|
||||
if ([containerAcls containsObject: SOGoRole_ObjectReader])
|
||||
[acls addObject: SOGoRole_ObjectViewer];
|
||||
#warning this should be checked
|
||||
if ([containerAcls containsObject: SOGoRole_ObjectEraser])
|
||||
[acls addObject: SOGoRole_ObjectEraser];
|
||||
|
||||
@@ -26,7 +26,6 @@
|
||||
NSString *SOGoRole_ObjectCreator = @"ObjectCreator";
|
||||
NSString *SOGoRole_ObjectEraser = @"ObjectEraser";
|
||||
NSString *SOGoRole_ObjectViewer = @"ObjectViewer";
|
||||
NSString *SOGoRole_ObjectReader = @"ObjectReader";
|
||||
NSString *SOGoRole_ObjectEditor = @"ObjectEditor";
|
||||
|
||||
NSString *SOGoRole_FolderCreator = @"FolderCreator";
|
||||
|
||||
Reference in New Issue
Block a user