From 1268e2370f04f18526498fad2f259cca926dc74c Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 13 Oct 2020 22:35:05 -0400
Subject: [PATCH] fix(calendar): fix all-day events in lists

All-day events start/end date were wrong when the period was covering a
DST change.
---
 SoObjects/Appointments/SOGoAppointmentFolder.m | 3 +--
 UI/Scheduler/UIxCalListingActions.m            | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index fd6855fb0..56cd09738 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -1566,8 +1566,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
 
       if (records)
         {
-          if (r)
-            records = [self _fixupRecords: records];
+          records = [self _fixupRecords: records];
           ma = [NSMutableArray arrayWithArray: records];
         }
       else
diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m
index e3bede592..e39bacd52 100644
--- a/UI/Scheduler/UIxCalListingActions.m
+++ b/UI/Scheduler/UIxCalListingActions.m
@@ -286,7 +286,7 @@ static NSArray *tasksFields = nil;
    */
   
   //NSLog(@"***[UIxCalListingActions _fixDates:] %@", [theRecord objectForKey: @"c_title"]);
-  if (dayBasedView || [[theRecord objectForKey: @"c_isallday"] boolValue])
+  if (currentView && (dayBasedView || [[theRecord objectForKey: @"c_isallday"] boolValue]))
   {
     for (count = 0; count < 2; count++)
     {