(fix) correctly handle all-day event exceptions when the master event changes
parent
faa5d83cf6
commit
4edb87978b
1
NEWS
1
NEWS
|
@ -12,6 +12,7 @@ Bug fixes
|
||||||
- JavaScript exception when printing events from calendars with no assigned color (#3203)
|
- JavaScript exception when printing events from calendars with no assigned color (#3203)
|
||||||
- EAS fix for wrong charset being used (#3392)
|
- EAS fix for wrong charset being used (#3392)
|
||||||
- EAS fix on qp-encoded subjects (#3390)
|
- EAS fix on qp-encoded subjects (#3390)
|
||||||
|
- correctly handle all-day event exceptions when the master event changes
|
||||||
|
|
||||||
2.3.3a (2015-11-18)
|
2.3.3a (2015-11-18)
|
||||||
-------------------
|
-------------------
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
#import "NSCalendarDate+NGCards.h"
|
#import "NSCalendarDate+NGCards.h"
|
||||||
|
|
||||||
#import "iCalAlarm.h"
|
#import "iCalAlarm.h"
|
||||||
|
#import "iCalCalendar.h"
|
||||||
#import "iCalDateTime.h"
|
#import "iCalDateTime.h"
|
||||||
#import "iCalEntityObject.h"
|
#import "iCalEntityObject.h"
|
||||||
#import "iCalEvent.h"
|
#import "iCalEvent.h"
|
||||||
|
@ -268,9 +269,12 @@
|
||||||
- (void) setRecurrenceId: (NSCalendarDate *) newRecId
|
- (void) setRecurrenceId: (NSCalendarDate *) newRecId
|
||||||
{
|
{
|
||||||
iCalDateTime* recurrenceId;
|
iCalDateTime* recurrenceId;
|
||||||
|
BOOL isMasterAllDay;
|
||||||
|
|
||||||
|
isMasterAllDay = [[[[self parent] events] objectAtIndex: 0] isAllDay];
|
||||||
|
|
||||||
recurrenceId = (iCalDateTime *) [self uniqueChildWithTag: @"recurrence-id"];
|
recurrenceId = (iCalDateTime *) [self uniqueChildWithTag: @"recurrence-id"];
|
||||||
if ([self isKindOfClass: [iCalEvent class]] && [(iCalEvent *)self isAllDay])
|
if ([self isKindOfClass: [iCalEvent class]] && isMasterAllDay)
|
||||||
[recurrenceId setDate: newRecId];
|
[recurrenceId setDate: newRecId];
|
||||||
else
|
else
|
||||||
[recurrenceId setDateTime: newRecId];
|
[recurrenceId setDateTime: newRecId];
|
||||||
|
|
Loading…
Reference in New Issue