parent
e54d5c1b06
commit
ec61fd10fc
1
NEWS
1
NEWS
|
@ -7,6 +7,7 @@ Bug fixes
|
||||||
- [web] fixed event classification icon (private/confidential) in month view (#3711)
|
- [web] fixed event classification icon (private/confidential) in month view (#3711)
|
||||||
- [web] CKEditor: added the pastefromword plugin (#2295, #3313)
|
- [web] CKEditor: added the pastefromword plugin (#2295, #3313)
|
||||||
- [web] fixed loading of card from global addressbooks
|
- [web] fixed loading of card from global addressbooks
|
||||||
|
- [web] fixed negative offset when saving an all-day event (#3717)
|
||||||
|
|
||||||
3.1.1 (2016-06-02)
|
3.1.1 (2016-06-02)
|
||||||
------------------
|
------------------
|
||||||
|
|
|
@ -338,9 +338,8 @@
|
||||||
- (void) setAttributes: (NSDictionary *) data
|
- (void) setAttributes: (NSDictionary *) data
|
||||||
inContext: (WOContext *) context
|
inContext: (WOContext *) context
|
||||||
{
|
{
|
||||||
NSCalendarDate *aptStartDate, *aptEndDate, *allDayStartDate;
|
NSCalendarDate *aptStartDate, *aptEndDate;
|
||||||
NSTimeZone *timeZone;
|
NSInteger nbrDays;
|
||||||
NSInteger offset, nbrDays;
|
|
||||||
iCalDateTime *startDate;
|
iCalDateTime *startDate;
|
||||||
iCalTimeZone *tz;
|
iCalTimeZone *tz;
|
||||||
SOGoUserDefaults *ud;
|
SOGoUserDefaults *ud;
|
||||||
|
@ -370,6 +369,16 @@
|
||||||
{
|
{
|
||||||
if (isAllDay)
|
if (isAllDay)
|
||||||
{
|
{
|
||||||
|
// Remove the vTimeZone when dealing with an all-day event.
|
||||||
|
startDate = (iCalDateTime *)[self uniqueChildWithTag: @"dtstart"];
|
||||||
|
tz = [startDate timeZone];
|
||||||
|
if (tz)
|
||||||
|
{
|
||||||
|
[startDate setTimeZone: nil];
|
||||||
|
[(iCalDateTime *)[self uniqueChildWithTag: @"dtend"] setTimeZone: nil];
|
||||||
|
[[self parent] removeChild: tz];
|
||||||
|
}
|
||||||
|
|
||||||
nbrDays = ((float) abs ([aptEndDate timeIntervalSinceDate: aptStartDate]) / 86400) + 1;
|
nbrDays = ((float) abs ([aptEndDate timeIntervalSinceDate: aptStartDate]) / 86400) + 1;
|
||||||
[self setAllDayWithStartDate: aptStartDate
|
[self setAllDayWithStartDate: aptStartDate
|
||||||
duration: nbrDays];
|
duration: nbrDays];
|
||||||
|
@ -405,18 +414,6 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else // if (![[self clientObject] isNew])
|
|
||||||
{
|
|
||||||
// Remove the vTimeZone when dealing with an all-day event.
|
|
||||||
startDate = (iCalDateTime *)[self uniqueChildWithTag: @"dtstart"];
|
|
||||||
tz = [startDate timeZone];
|
|
||||||
if (tz)
|
|
||||||
{
|
|
||||||
[startDate setTimeZone: nil];
|
|
||||||
[(iCalDateTime *)[self uniqueChildWithTag: @"dtend"] setTimeZone: nil];
|
|
||||||
[[self parent] removeChild: tz];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
Loading…
Reference in New Issue