amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-23 20:35:24 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 8bae8ee0ffba06f4b31f504c8f6d8671827d1a97

Browse Source 
Monotone-Revision: d6a619fbf875335523673d5bf683e34b3ac7887e

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-06-08T14:32:21
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
C Robert
2009-06-08 14:32:21 +00:00
parent 5992021354
commit ec8c7a2f42
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+5
View File
@@ -1,3 +1,8 @@
2009-06-08 Cyril Robert <crobert@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.m: Added c_cycleenddate in
dav date limitation.
2009-06-05 Cyril Robert <crobert@inverse.ca>
* UI/Scheduler/UIxCalListingActions.m: Added support to ignore
SoObjects/Appointments/SOGoAppointmentFolder.m
+11 -1
View File
@@ -1382,7 +1382,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
{
maxStart = [self _getMaxStartDate];
if (maxStart)
[self _addDateRangeLimitToFilter: filterData];
[self _addDateRangeLimitToFilter: filterData];
}
[filterData setObject: [NSNumber numberWithBool: NO] forKey: @"iscycle"];
}
@@ -1434,6 +1434,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
NSMutableDictionary *rc;
rc = [NSMutableDictionary dictionaryWithDictionary: filter];
[rc setObject: [rc objectForKey: @"start"] forKey: @"cycleenddate"];
[rc removeObjectForKey: @"start"];
[rc removeObjectForKey: @"end"];
[rc setObject: sharedYes forKey: @"iscycle"];
@@ -1496,6 +1497,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
static NSArray *fields = nil;
NSMutableArray *filters;
NSNumber *cycle;
NSCalendarDate *cEndDate;
#warning the list of fields should be taken from the .ocs description file
if (!fields)
@@ -1525,6 +1527,14 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
filterString = [NSString stringWithFormat: @"(c_iscycle = '%d')",
[cycle intValue]];
[filters addObject: filterString];
if ([cycle intValue])
{
cEndDate = [filter objectForKey: @"cycleenddate"];
filterString = [NSString stringWithFormat: @"(c_cycleenddate >= %u)",
(unsigned int) [cEndDate timeIntervalSince1970]];
[filters addObject: filterString];
}
}
if ([filters count])