From 61c0072fc5a02343856f5d403427ffb7fb65cefd Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 9 Dec 2009 21:46:05 +0000 Subject: [PATCH] Monotone-Parent: 6c845252270eb03967ac431437dea26441d69532 Monotone-Revision: 9003f157ebcad8369e5e69e70dc966267d1cf728 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-12-09T21:46:05 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ SoObjects/SOGo/SOGoUserFolder.m | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ede62d2ce..8ed0ffc10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-12-09 Wolfgang Sourdeau + + * SoObjects/SOGo/SOGoUserFolder.m (-toManyRelationShipKeys) + (-lookupName:inContext:acquire:): fixed typo preventing access to + Contacts module. + 2009-12-08 Wolfgang Sourdeau * SoObjects/SOGo/WORequest+SOGo.m (-handledByDefaultHandler): diff --git a/SoObjects/SOGo/SOGoUserFolder.m b/SoObjects/SOGo/SOGoUserFolder.m index fe593b41d..f8dccf6ee 100644 --- a/SoObjects/SOGo/SOGoUserFolder.m +++ b/SoObjects/SOGo/SOGoUserFolder.m @@ -89,7 +89,7 @@ [children addObject: @"calendar-proxy-read"]; } } - if (isDAVRequest && [sd isAddressBookDAVAccessEnabled]) + if (!isDAVRequest || [sd isAddressBookDAVAccessEnabled]) [children addObject: @"Contacts"]; if ([currentUser canAccessModule: @"Mail"]) [children addObject: @"Mail"]; @@ -583,7 +583,7 @@ if (!obj && [_key isEqualToString: @"Contacts"] - && (isDAVRequest && [sd isAddressBookDAVAccessEnabled])) + && (!isDAVRequest || [sd isAddressBookDAVAccessEnabled])) obj = [self privateContacts: _key inContext: _ctx]; // else if ([_key isEqualToString: @"Preferences"])