See Changelog

Monotone-Parent: 32cd5a079647012d95c71e50afa10e704a083b86
Monotone-Revision: b99a47157b925a50d1bf80f94b80de642f2aad73

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-02-24T15:09:30
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2011-02-24 15:09:30 +00:00
parent 59aab29d6d
commit b813ac9f80
2 changed files with 9 additions and 4 deletions
+6
View File
@@ -1,3 +1,9 @@
2011-02-24 Francis Lachapelle <flachapelle@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.m
(-_flattenCycleRecord:forRange:intoArray:): fixed the condition
that checks if the event lasts all-day.
2011-02-23 Ludovic Marcotte <lmarcotte@inverse.ca>
* We now strip the bcc header in SOGoDraftObject instead
@@ -904,7 +904,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
endDate: checkEndDate];
exDates = [eventTimeZone computedDatesForStrings: exDates];
}
else if ([theRecord objectForKey: @"c_isallday"])
else if ([[theRecord objectForKey: @"c_isallday"] boolValue])
{
// The event lasts all-day and has no timezone (floating); we convert the range of the first event
// to the user's timezone
@@ -918,7 +918,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
firstRange = [NGCalendarDateRange calendarDateRangeWithStartDate: firstStartDate
endDate: firstEndDate];
}
// Calculate the occurrences for the given range
ranges = [iCalRecurrenceCalculator recurrenceRangesWithinCalendarDateRange: theRange
firstInstanceCalendarDateRange: firstRange
@@ -1121,8 +1121,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
else
ma = nil;
/* fetch recurrent apts now. we do NOT consider events with no cycle
end. */
// Fetch recurrent apts now, *excluding* events with no cycle end.
if (canCycle && _endDate)
{
where = [NSString stringWithFormat: @"%@ AND c_iscycle = 1", baseWhere];