From 0e0a8468e68f8bb250214efa0c9b11048c354ec4 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 17 Jun 2009 13:32:31 +0000 Subject: [PATCH] Monotone-Parent: 285b0bf17b6ea471398e5206f488b3358f436b62 Monotone-Revision: ad0652e110056f0a30b9fa6a1efffe2bd0de832a Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-06-17T13:32:31 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 +++ SoObjects/SOGo/SOGoUser.m | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b74ff0799..f4d2d5a0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2009-06-17 Wolfgang Sourdeau + * SoObjects/SOGo/SOGoUser.m (-rolesForObject:inContext:): do not + query the acls for the object if the current user is its owner. + * SoObjects/SOGo/SOGoParentFolder.m (-initSubFoldersMatching:): renamed from "initSubFolders". Take a string argument that, if specified, will stop the search of folders when the name can be diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m index 3a5587ed1..2a2646cf9 100644 --- a/SoObjects/SOGo/SOGoUser.m +++ b/SoObjects/SOGo/SOGoUser.m @@ -972,7 +972,7 @@ _timeValue (NSString *key) if ((superUsernames && [superUsernames containsObject: login]) || [[object ownerInContext: context] isEqualToString: login]) [rolesForObject addObject: SoRole_Owner]; - if ([object isKindOfClass: [SOGoObject class]]) + else if ([object isKindOfClass: [SOGoObject class]]) { sogoRoles = [(SOGoObject *) object aclsForUser: login]; if ([sogoRoles count])