Monotone-Parent: e56c57c107b1d198ce32e856e9c15566c922b7e8
Monotone-Revision: a1e2bdd30445a163154da554452a2f3c2d99c300 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-07-23T18:23:11 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
470e663f43
commit
5ff0a76211
|
@ -292,7 +292,7 @@
|
||||||
{
|
{
|
||||||
NSMutableArray *folders;
|
NSMutableArray *folders;
|
||||||
NSEnumerator *subfolders;
|
NSEnumerator *subfolders;
|
||||||
SOGoGCSFolder *currentFolder;
|
SOGoGCSFolder *subfolder;
|
||||||
NSString *folderName;
|
NSString *folderName;
|
||||||
NSMutableDictionary *currentDictionary;
|
NSMutableDictionary *currentDictionary;
|
||||||
SoSecurityManager *securityManager;
|
SoSecurityManager *securityManager;
|
||||||
|
@ -307,20 +307,20 @@
|
||||||
[folders autorelease];
|
[folders autorelease];
|
||||||
|
|
||||||
subfolders = [[parentFolder subFolders] objectEnumerator];
|
subfolders = [[parentFolder subFolders] objectEnumerator];
|
||||||
while ((currentFolder = [subfolders nextObject]))
|
while ((subfolder = [subfolders nextObject]))
|
||||||
{
|
{
|
||||||
if (![securityManager validatePermission: SOGoPerm_AccessObject
|
if (![securityManager validatePermission: SOGoPerm_AccessObject
|
||||||
onObject: currentFolder inContext: context])
|
onObject: subfolder inContext: context])
|
||||||
{
|
{
|
||||||
folderName = [NSString stringWithFormat: @"/%@/%@",
|
folderName = [NSString stringWithFormat: @"/%@/%@",
|
||||||
[parentFolder nameInContainer],
|
[parentFolder nameInContainer],
|
||||||
[currentFolder nameInContainer]];
|
[subfolder nameInContainer]];
|
||||||
currentDictionary
|
currentDictionary
|
||||||
= [NSMutableDictionary dictionaryWithCapacity: 3];
|
= [NSMutableDictionary dictionaryWithCapacity: 3];
|
||||||
[currentDictionary setObject: [currentFolder displayName]
|
[currentDictionary setObject: [subfolder displayName]
|
||||||
forKey: @"displayName"];
|
forKey: @"displayName"];
|
||||||
[currentDictionary setObject: folderName forKey: @"name"];
|
[currentDictionary setObject: folderName forKey: @"name"];
|
||||||
[currentDictionary setObject: [currentFolder folderType]
|
[currentDictionary setObject: [subfolder folderType]
|
||||||
forKey: @"type"];
|
forKey: @"type"];
|
||||||
[folders addObject: currentDictionary];
|
[folders addObject: currentDictionary];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue