From aad469d8e03f9850dd4d907b9547cc1b9887405c Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 29 Jun 2007 21:59:40 +0000 Subject: [PATCH] Monotone-Parent: 391c86af1611daea47437aa67b055b9da54ab6a5 Monotone-Revision: 53884258a5614708a5c6c71e0b9067398269d479 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-06-29T21:59:40 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ SoObjects/Appointments/SOGoAppointmentFolder.m | 11 ++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1fa470919..838d0abbd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2007-06-29 Wolfgang Sourdeau + * SoObjects/Appointments/SOGoAppointmentFolder.m + ([SOGoAppointmentFolder -folderIsMandatory]): returns YES since + users must have one Calendar folder (one and only one). + * SoObjects/SOGo/SOGoFolder.m ([SOGoFolder -ocsFolder]): new method that create the folder if considered mandatory. ([SOGoFolder -folderIsMandatory]): new method that determines diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m index 66d5c14cc..6f098b7b5 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolder.m +++ b/SoObjects/Appointments/SOGoAppointmentFolder.m @@ -111,6 +111,11 @@ static NSNumber *sharedYes = nil; return logger; } +- (BOOL) folderIsMandatory +{ + return YES; +} + /* selection */ - (NSArray *) calendarUIDs @@ -745,12 +750,12 @@ static NSNumber *sharedYes = nil; privacySqlString = [NSString stringWithFormat: @"(%@(orgmail = '%@')" - @" or ((partmails caseInsensitiveLike '%@%%'" - @" or partmails caseInsensitiveLike '%%\\n%@%%')))", + @" or ((partmails caseInsensitiveLike '%@%%'" + @" or partmails caseInsensitiveLike '%%\n%@%%')))", [self _privacyClassificationStringsForUID: login], email, email, email]; } - + return privacySqlString; }