amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-09-19 12:22:52 +00:00
Code Issues Projects Releases Wiki Activity

See ChangeLog

Browse Source 
Monotone-Parent: dbdbcb850a04de2fdfc39935636d2339fe1b7ead
Monotone-Revision: 3becdd5041a3336d6435f00058f362363842bf2a

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-06-09T17:50:25
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2009-06-09 17:50:25 +00:00
parent 6d4a6c8df0
commit 0a8a256eed
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/Appointments/SOGoAppointmentFolder.m
+5 -4
View File
@@ -418,8 +418,9 @@ static NSArray *reducedReportQueryFields = nil;
start = (unsigned int) [_startDate timeIntervalSince1970];
end = (unsigned int) [_endDate timeIntervalSince1970];
// vTODOs don't necessarily have start/end dates
return [NSString stringWithFormat:
@" AND (c_startdate <= %u) AND (c_enddate >= %u)",
@" AND (c_startdate = NULL OR c_startdate <= %u) AND (c_enddate = NULL OR c_enddate >= %u)",
end, start];
}
@@ -515,7 +516,7 @@ static NSArray *reducedReportQueryFields = nil;
sql = [[NSString stringWithFormat: @"%@%@%@%@",
dateSqlString, titleSqlString, componentSqlString,
filterSqlString] substringFromIndex: 4];
/* fetch non-recurrent apts first */
qualifier = [EOQualifier qualifierWithQualifierFormat: sql];
@@ -1537,14 +1538,14 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
{
cEndDate = [filter objectForKey: @"cycleenddate"];
filterString = [NSString stringWithFormat:
@"(c_cycleenddate = NULL or c_cycleenddate >= %u)",
@"(c_cycleenddate = NULL OR c_cycleenddate >= %u)",
(unsigned int) [cEndDate timeIntervalSince1970]];
[filters addObject: filterString];
}
}
if ([filters count])
additionalFilter = [filters componentsJoinedByString: @" and "];
additionalFilter = [filters componentsJoinedByString: @" AND "];
else
additionalFilter = nil;
[filters release];