From 6a58d17252f415a3becadb8683dab79ca4821c11 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 17 Jun 2009 15:55:35 +0000 Subject: [PATCH] Monotone-Parent: c9ad04cf940b51e28fe7c5aaea670fb0da5e3456 Monotone-Revision: 796c6bb92f7f6f97be354aeb3b35c39751605e50 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-06-17T15:55:35 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 +++ SoObjects/Appointments/SOGoAppointmentFolder.m | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b9b642fa3..351521547 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2009-06-17 Wolfgang Sourdeau + * SoObjects/Appointments/SOGoAppointmentFolder.m + (-fetchFields:...): don't use the privacySqlString twice. + * UI/MailPartViewers/UIxMailPartICalViewer.m (-storedEventObject): use the new "storedEventFetched" bool ivar to specify whether we already attempted to fetch the event from the user calendars. diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m index fa3626b1e..79a898acb 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolder.m +++ b/SoObjects/Appointments/SOGoAppointmentFolder.m @@ -480,12 +480,12 @@ static NSArray *reducedReportQueryFields = nil; [deniedClasses objectAtIndex: 0]]; else if (grantedCount == 1) privacySqlString - = [NSString stringWithFormat: @"c_classification == %@", + = [NSString stringWithFormat: @"c_classification = %@", [grantedClasses objectAtIndex: 0]]; else /* We prevent any event/task from being listed. There must be a better way... */ - privacySqlString = @"0 == 1"; + privacySqlString = @"c_classification = 255"; } return privacySqlString; @@ -1027,8 +1027,8 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir /* fetch recurrent apts now. we do NOT consider events with no cycle end. */ if (_endDate || filters) { - sql = [NSString stringWithFormat: @"(c_iscycle = 1) %@ %@ %@ %@", titleSqlString, - componentSqlString, privacySqlString, filterSqlString]; + sql = [NSString stringWithFormat: @"(c_iscycle = 1) %@ %@ %@", titleSqlString, + componentSqlString, filterSqlString]; qualifier = [EOQualifier qualifierWithQualifierFormat: sql];