From 4170078c0b417217994e6bdf4baea29ca0e6f452 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 14 Sep 2007 22:49:49 +0000 Subject: [PATCH] Monotone-Parent: 39a12d6ba6be4513ed7ad704d541c95afc4a2d1d Monotone-Revision: 689d3d08796f0dfac036230102b579346decb74a Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-09-14T22:49:49 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ SoObjects/Appointments/SOGoFreeBusyObject.m | 11 +++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2a1e038f4..4220f3976 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2007-09-14 Wolfgang Sourdeau + * SoObjects/Appointments/SOGoFreeBusyObject.m ([SOGoFreeBusyObject + -fetchFreeBusyInfosFrom:_startDateto:_endDate]): fetch the + freebusy info from the "personal" calendar. + * UI/Common/UIxParentFolderActions.m ([UIxParentFolderActions -createFolderAction]): new standardized method for requesting folder creations among gcs-based modules. diff --git a/SoObjects/Appointments/SOGoFreeBusyObject.m b/SoObjects/Appointments/SOGoFreeBusyObject.m index bddee8ace..ef40274dc 100644 --- a/SoObjects/Appointments/SOGoFreeBusyObject.m +++ b/SoObjects/Appointments/SOGoFreeBusyObject.m @@ -35,6 +35,8 @@ #import #import +#import "SOGoAppointmentFolder.h" + #import "SOGoFreeBusyObject.h" @interface SOGoFreeBusyObject (PrivateAPI) @@ -80,17 +82,18 @@ - (NSArray *) fetchFreeBusyInfosFrom: (NSCalendarDate *) _startDate to: (NSCalendarDate *) _endDate { - id calFolder; + SOGoAppointmentFolder *calFolder; // SoSecurityManager *sm; NSArray *infos; - calFolder = [container lookupName: @"Calendar" inContext: nil acquire: NO]; + calFolder = [[container lookupName: @"Calendar" inContext: nil acquire: NO] + lookupName: @"personal" inContext: nil acquire: NO]; // sm = [SoSecurityManager sharedSecurityManager]; // if (![sm validatePermission: SOGoPerm_FreeBusyLookup // onObject: calFolder // inContext: context]) - infos = [calFolder fetchFreeBusyInfosFrom: _startDate - to: _endDate]; + infos = [calFolder fetchFreeBusyInfosFrom: _startDate + to: _endDate]; // else // { // infos = [NSArray new];