LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(web) Fix freebusy information with all-day events

pull/229/merge
Francis Lachapelle 2018-09-18 11:34:40 -04:00
parent d05e1fed5d
commit b90d312f43
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -16,6 +16,7 @@ Bug fixes
- [web] fixed synchronisation of calendar categories
- [web] fixed popup window detection in message viewer (#4518)
- [web] fixed behaviour of return receipt actions
- [web] fixed freebusy information with all-day events
- [core] fixed email reminders support for tasks
- [core] fixed time conflict validation (#4539)

4
UI/MainUI/SOGoUserHomePage.m
View File

@ -196,6 +196,8 @@
// User is busy for this event
currentStartDate = [record objectForKey: @"startDate"];
currentEndDate = [record objectForKey: @"endDate"];
if ([currentStartDate earlierDate: startDate] == currentStartDate)
currentStartDate = startDate;
dayKey = [currentStartDate shortDateString];
dayData = [freeBusy objectForKey: dayKey];
if (!dayData)
@ -203,8 +205,6 @@
dayData = [NSMutableDictionary dictionary];
[freeBusy setObject: dayData forKey: dayKey];
}
if ([currentStartDate earlierDate: startDate] == currentStartDate)
currentStartDate = startDate;
currentDate = [NSCalendarDate dateWithYear: [currentStartDate yearOfCommonEra]
month: [currentStartDate monthOfYear]