#25293: return date fields as timestamp in content map to fix date fo…

…rmat
dotCMS · Jul 14, 2023 · 3036370 · 3036370
1 parent 43446db
commit 3036370
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/ContentMap.java b/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/content/ContentMap.java
@@ -46,16 +46,8 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
+import java.sql.Timestamp;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -402,6 +394,11 @@ public String toString() {
 				ret = conAPI.getFieldValue(content, f);
 			}
 
+			// if return value is date, convert to timestamp to be used in velocity
+			if (ret instanceof Date && !(ret instanceof Timestamp)) {
+				ret = new Timestamp(((Date) ret).getTime());
+			}
+
 			//handle Velocity Code
 			if(parseVelocity && ret != null && (f == null || f.getFieldType().equals(Field.FieldType.TEXT.toString()) || f.getFieldType().equals(Field.FieldType.TEXT_AREA.toString()) || f.getFieldType().equals(Field.FieldType.CUSTOM_FIELD.toString()) || f.getFieldType().equals(Field.FieldType.WYSIWYG.toString())) && (ret.toString().contains("#") || ret.toString().contains("$"))){
 				VelocityEngine ve = VelocityUtil.getEngine();