IBX-1090: Fixed calculations and displaying of ezdate FT, as it shoul…

…d always be represented in UTC (#2033)
ezsystems · Feb 16, 2022 · 0a6e5e4 · 0a6e5e4
1 parent bc114dc
commit 0a6e5e4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezdate.js b/src/bundle/Resources/public/js/scripts/fieldType/ezdate.js
@@ -73,9 +73,10 @@
             return;
         }
 
-        const selectedDateWithUserTimezone = eZ.helpers.timezone.convertDateToTimezone(date[0], eZ.adminUiConfig.timezone, true);
+        date = new Date(date[0]);
+        date = new Date(Date.UTC(date.getFullYear(), date.getMonth(), date.getDate()));
 
-        sourceInput.value = Math.floor(selectedDateWithUserTimezone.valueOf() / 1000);
+        sourceInput.value = Math.floor(date.valueOf() / 1000);
         sourceInput.dispatchEvent(event);
     };
     const clearValue = (sourceInput, flatpickrInstance, event) => {
@@ -99,7 +100,15 @@
             if (actionType === 'create') {
                 defaultDate.setTime(new Date().getTime());
             } else if (actionType === 'edit') {
-                defaultDate.setTime(defaultDate.getTime());
+                defaultDate = new Date(
+                    defaultDate.getUTCFullYear(),
+                    defaultDate.getUTCMonth(),
+                    defaultDate.getUTCDate(),
+                    0,
+                    0,
+                    0,
+                    0
+                );
             }
 
             updateInputValue(sourceInput, [defaultDate]);

diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/preview/content_fields.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/preview/content_fields.html.twig
@@ -81,7 +81,7 @@
 {% block ezdate_field %}
 {% apply spaceless %}
     {% if not ez_field_is_empty( content, field ) %}
-        {% set field_value = field.value.date|ez_full_date %}
+        {% set field_value = field.value.date|ez_full_date('UTC') %}
         {{ block( 'simple_block_field' ) }}
     {% endif %}
 {% endapply %}