From e78b90bfaa66d202a436ee857203c2aa52f36fd7 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Mon, 20 Jul 2009 14:23:05 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: 2ec2bb218c1f6876ffaba4bb7f29f652a1080446 Monotone-Revision: 3c522ae41fe50f5ebe60bb22d26f407dc4c942d4 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2009-07-20T14:23:05 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 10 ++++++++++ SoObjects/Appointments/SOGoAppointmentFolder.m | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7e61ce8f0..051daa279 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2009-07-20 Francis Lachapelle + + * SoObjects/Appointments/SOGoAppointmentFolder.m + ([SOGoAppointmentFolder + -fetchFields:from:to:title:component:additionalFilters:includeProtectedInformation:): + avoid returning repeating events when no end date is + defined. Ultimately, we should return the first occurrence of + repeating events when no end date is defined and therefore, move + the logic into iCalRecurrenceCalculators. + 2009-07-19 Wolfgang Sourdeau * UI/SOGoUI/UIxComponent.m (-responseWithStatus:): revert the diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m index a901a7b19..aa5f28ce2 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolder.m +++ b/SoObjects/Appointments/SOGoAppointmentFolder.m @@ -997,7 +997,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir /* fetch recurrent apts now. we do NOT consider events with no cycle end. */ // || _endDate || filters) - if (canCycle) + if (canCycle && _endDate) { where = [NSString stringWithFormat: @"%@ AND c_iscycle = 1", baseWhere]; qualifier = [EOQualifier qualifierWithQualifierFormat: [where substringFromIndex: 4]];