From 6332243d2d24ccbf99b723bc29f25dfacb38c137 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sat, 19 Feb 2022 17:43:05 +0100
Subject: [PATCH] Bugfix for handling LocalDateTime in
 EventListItemModelBuilder

---
 .../pages/models/EventListItemModelBuilder.java     | 13 +++++++++++--
 .../pages/models/NewsListItemModelBuilder.java      |  1 -
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ccm-cms/src/main/java/org/librecms/pages/models/EventListItemModelBuilder.java b/ccm-cms/src/main/java/org/librecms/pages/models/EventListItemModelBuilder.java
index f1e1636ef..3b3e2c7de 100644
--- a/ccm-cms/src/main/java/org/librecms/pages/models/EventListItemModelBuilder.java
+++ b/ccm-cms/src/main/java/org/librecms/pages/models/EventListItemModelBuilder.java
@@ -22,6 +22,7 @@ import org.libreccm.l10n.GlobalizationHelper;
 import org.librecms.contenttypes.Event;
 
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 
 import javax.inject.Inject;
 
@@ -50,13 +51,21 @@ public class EventListItemModelBuilder
         final Event event, final EventListItemModel model
     ) {
         super.addProperties(event, model);
-        model.setEndDate(LocalDateTime.from(event.getEndDate().toInstant()));
+        model.setEndDate(
+            LocalDateTime.from(
+                event.getEndDate().toInstant().atZone(ZoneId.systemDefault())
+            )
+        );
         model.setLocation(
             globalizationHelper.getValueFromLocalizedString(
                 event.getLocation()
             )
         );
-        model.setStartDate(LocalDateTime.from(event.getStartDate().toInstant()));
+        model.setStartDate(
+            LocalDateTime.from(
+                event.getStartDate().toInstant().atZone(ZoneId.systemDefault())
+            )
+        );
     }
 
 }
diff --git a/ccm-cms/src/main/java/org/librecms/pages/models/NewsListItemModelBuilder.java b/ccm-cms/src/main/java/org/librecms/pages/models/NewsListItemModelBuilder.java
index b3e91c4e7..2f478b5c7 100644
--- a/ccm-cms/src/main/java/org/librecms/pages/models/NewsListItemModelBuilder.java
+++ b/ccm-cms/src/main/java/org/librecms/pages/models/NewsListItemModelBuilder.java
@@ -18,7 +18,6 @@
  */
 package org.librecms.pages.models;
 
-import org.libreccm.l10n.GlobalizationHelper;
 import org.librecms.contenttypes.News;
 
 import java.time.LocalDateTime;