LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

Bugfix for handling LocalDateTime in EventListItemModelBuilder

pull/20/head
Jens Pelzetter 2022-02-19 17:43:05 +01:00
parent 80729ed936
commit 6332243d2d
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ccm-cms/src/main/java/org/librecms/pages/models/EventListItemModelBuilder.java
View File

@ -22,6 +22,7 @@ import org.libreccm.l10n.GlobalizationHelper;
import org.librecms.contenttypes.Event; import org.librecms.contenttypes.Event;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.ZoneId;
import javax.inject.Inject; import javax.inject.Inject;
@ -50,13 +51,21 @@ public class EventListItemModelBuilder
final Event event, final EventListItemModel model final Event event, final EventListItemModel model
) { ) {
super.addProperties(event, model); super.addProperties(event, model);
model.setEndDate(LocalDateTime.from(event.getEndDate().toInstant())); model.setEndDate(
LocalDateTime.from(
event.getEndDate().toInstant().atZone(ZoneId.systemDefault())
)
);
model.setLocation( model.setLocation(
globalizationHelper.getValueFromLocalizedString( globalizationHelper.getValueFromLocalizedString(
event.getLocation() event.getLocation()
) )
); );
model.setStartDate(LocalDateTime.from(event.getStartDate().toInstant())); model.setStartDate(
LocalDateTime.from(
event.getStartDate().toInstant().atZone(ZoneId.systemDefault())
)
);
} }
} }

1
ccm-cms/src/main/java/org/librecms/pages/models/NewsListItemModelBuilder.java
View File

@ -18,7 +18,6 @@
*/ */
package org.librecms.pages.models; package org.librecms.pages.models;
import org.libreccm.l10n.GlobalizationHelper;
import org.librecms.contenttypes.News; import org.librecms.contenttypes.News;
import java.time.LocalDateTime; import java.time.LocalDateTime;