From b90d312f43588a67f96e2f13c0babef9fe981fcc Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 18 Sep 2018 11:34:40 -0400 Subject: [PATCH] (web) Fix freebusy information with all-day events --- NEWS | 1 + UI/MainUI/SOGoUserHomePage.m | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 48102e971..3d4351516 100644 --- a/NEWS +++ b/NEWS @@ -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) diff --git a/UI/MainUI/SOGoUserHomePage.m b/UI/MainUI/SOGoUserHomePage.m index 55d561437..c4be5781d 100644 --- a/UI/MainUI/SOGoUserHomePage.m +++ b/UI/MainUI/SOGoUserHomePage.m @@ -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]