LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Monotone-Parent: c9ad04cf940b51e28fe7c5aaea670fb0da5e3456

Browse source 
Monotone-Revision: 796c6bb92f7f6f97be354aeb3b35c39751605e50

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-06-17T15:55:35
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau 2009-06-17 15:55:35 +00:00
parent fdca438330
commit 6a58d17252
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2009-06-17 Wolfgang Sourdeau <wsourdeau@inverse.ca> 2009-06-17 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.m
(-fetchFields:...): don't use the privacySqlString twice.
* UI/MailPartViewers/UIxMailPartICalViewer.m (-storedEventObject): * UI/MailPartViewers/UIxMailPartICalViewer.m (-storedEventObject):
use the new "storedEventFetched" bool ivar to specify whether we use the new "storedEventFetched" bool ivar to specify whether we
already attempted to fetch the event from the user calendars. already attempted to fetch the event from the user calendars.

8
SoObjects/Appointments/SOGoAppointmentFolder.m
View file

@ -480,12 +480,12 @@ static NSArray *reducedReportQueryFields = nil;
[deniedClasses objectAtIndex: 0]]; [deniedClasses objectAtIndex: 0]];
else if (grantedCount == 1) else if (grantedCount == 1)
privacySqlString privacySqlString
= [NSString stringWithFormat: @"c_classification == %@", = [NSString stringWithFormat: @"c_classification = %@",
[grantedClasses objectAtIndex: 0]]; [grantedClasses objectAtIndex: 0]];
else else
/* We prevent any event/task from being listed. There must be a better /* We prevent any event/task from being listed. There must be a better
way... */ way... */
privacySqlString = @"0 == 1"; privacySqlString = @"c_classification = 255";
} }
return privacySqlString; return privacySqlString;
@ -1027,8 +1027,8 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
/* fetch recurrent apts now. we do NOT consider events with no cycle end. */ /* fetch recurrent apts now. we do NOT consider events with no cycle end. */
if (_endDate || filters) if (_endDate || filters)
{ {
sql = [NSString stringWithFormat: @"(c_iscycle = 1) %@ %@ %@ %@", titleSqlString, sql = [NSString stringWithFormat: @"(c_iscycle = 1) %@ %@ %@", titleSqlString,
componentSqlString, privacySqlString, filterSqlString]; componentSqlString, filterSqlString];
qualifier = [EOQualifier qualifierWithQualifierFormat: sql]; qualifier = [EOQualifier qualifierWithQualifierFormat: sql];