From 49ab6e5bc20c0758bd4afeb248f189f1a35f76f7 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 7 Jun 2010 12:45:22 +0000 Subject: [PATCH] Monotone-Parent: 85281fd909e8f0d613327a321fb964be7ca872ca Monotone-Revision: f273242650aaecbcba217ab4ee2f04f5964f3ab0 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-06-07T12:45:22 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ SoObjects/Appointments/SOGoAppointmentFolders.m | 13 ++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee5fd8cb6..ded5bc81b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-06-07 Wolfgang Sourdeau + * SoObjects/Appointments/SOGoAppointmentFolders.m + (-toOneRelationShipKeys): with a request from iCal, we return + nothing to avoid confusing iCal 3 with non-collection resources. + * UI/Common/UIxAclEditor.m (-isPublicAccessEnabled): we now expose the state of public access in order to not show the "anonymous" user when not needed. diff --git a/SoObjects/Appointments/SOGoAppointmentFolders.m b/SoObjects/Appointments/SOGoAppointmentFolders.m index cd14805f4..a8420350b 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolders.m +++ b/SoObjects/Appointments/SOGoAppointmentFolders.m @@ -155,10 +155,10 @@ && ![folder isSubscription]) { folderObjectKey = [NSString stringWithFormat: @"%@.ics", - [folder nameInContainer]]; + [folder nameInContainer]]; [folderObjectKeys addObject: folderObjectKey]; folderObjectKey = [NSString stringWithFormat: @"%@.xml", - [folder nameInContainer]]; + [folder nameInContainer]]; [folderObjectKeys addObject: folderObjectKey]; } } @@ -169,7 +169,14 @@ - (NSArray *) toOneRelationshipKeys { - return [self folderObjectKeys]; + NSArray *keys; + + if ([[contextd request] isICal]) + keys = [NSArray array]; + else + keys = [self folderObjectKeys]; + + return keys; } - (id) lookupName: (NSString *) name