From 7663cdc37d5d37441105d8eb1a6d0e45ee45a566 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Fri, 23 Oct 2009 21:00:49 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: 5cc529e77d87c48d01d645b60e6978e296c9f09a Monotone-Revision: 7c369f5daacf319b74a648fea43f833dda69d81d Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2009-10-23T21:00:49 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 5 +++++ SoObjects/SOGo/SOGoUserFolder.m | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 01a314f7a..a3f9fa915 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-10-23 Ludovic Marcotte + + * SoObjects/SOGo/SOGoUserFolder.m (-subFoldersFromFolder:) + Addded a check to NOT return web calendars in this query. + 2009-10-23 Francis Lachapelle * UI/MailerUI/UIxMailMainFrame.m (-formattedMailtoString:): fixed diff --git a/SoObjects/SOGo/SOGoUserFolder.m b/SoObjects/SOGo/SOGoUserFolder.m index 1bcdb660d..e55f8bce9 100644 --- a/SoObjects/SOGo/SOGoUserFolder.m +++ b/SoObjects/SOGo/SOGoUserFolder.m @@ -170,7 +170,8 @@ static NSString *LDAPContactInfoAttribute = nil; if (![securityManager validatePermission: SOGoPerm_AccessObject onObject: currentFolder inContext: context] && [[currentFolder ownerInContext: context] - isEqualToString: folderOwner]) + isEqualToString: folderOwner] + && [NSStringFromClass([currentFolder class]) compare: @"SOGoWebAppointmentFolder"] != NSOrderedSame) { folderName = [NSString stringWithFormat: @"/%@/%@", [parentFolder nameInContainer],