From e24f51364ba8c1839df930c27c57b1c820dd27e9 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 27 Mar 2007 18:19:33 +0000 Subject: [PATCH] Monotone-Parent: 27c9258114601f08525990a7068b3d1fb02b6c43 Monotone-Revision: 232c78312a70377451f4694882d72614fcfd13d5 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-03-27T18:19:33 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ SoObjects/Contacts/SOGoContactFolders.m | 19 ++++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9c52fe0ad..7331f47af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2007-03-27 Wolfgang Sourdeau + * SoObjects/Contacts/SOGoContactFolders.m ([SOGoContactFolders + -roleOfUser:uidinContext:context]): take all the subkeys into + account, not only the "personal" folder. + * UI/Scheduler/UIxComponentEditor.m ([UIxComponentEditor -takeValuesFromRequest:_rqinContext:_ctx]): append a "uid" field to the new components. diff --git a/SoObjects/Contacts/SOGoContactFolders.m b/SoObjects/Contacts/SOGoContactFolders.m index 4e57d72d5..fb81bb53a 100644 --- a/SoObjects/Contacts/SOGoContactFolders.m +++ b/SoObjects/Contacts/SOGoContactFolders.m @@ -239,17 +239,14 @@ if ([traversalPath count] > 2) { objectName = [traversalPath objectAtIndex: 2]; - if ([objectName isEqualToString: @"personal"]) - { - roles = [[context activeUser] - rolesForObject: [self lookupName: objectName - inContext: context - acquire: NO] - inContext: context]; - if ([roles containsObject: SOGoRole_Assistant] - || [roles containsObject: SOGoRole_Delegate]) - role = SOGoRole_Assistant; - } + roles = [[context activeUser] + rolesForObject: [self lookupName: objectName + inContext: context + acquire: NO] + inContext: context]; + if ([roles containsObject: SOGoRole_Assistant] + || [roles containsObject: SOGoRole_Delegate]) + role = SOGoRole_Assistant; } return role;