Merge branch '5.21' into 5.22

ems-project · Dec 5, 2024 · f3224d0 · f3224d0
2 parents ee3fb8d + 092d3c0
commit f3224d0
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/EMS/core-bundle/src/Form/DataField/TimeFieldType.php b/EMS/core-bundle/src/Form/DataField/TimeFieldType.php
@@ -106,8 +106,11 @@ public function reverseViewTransform($data, FieldType $fieldType): DataField
     {
         $format = static::getFormat($fieldType->getOptions());
         $converted = !\is_array($data) ? \DateTime::createFromFormat($format, \strval($data)) : false;
+        $convertedFromStoreFormat = !\is_array($data) ? \DateTime::createFromFormat($this::STOREFORMAT, \strval($data)) : false;
         if ($converted) {
             $out = $converted->format($this::STOREFORMAT);
+        } elseif ($convertedFromStoreFormat) {
+            $out = $convertedFromStoreFormat->format($this::STOREFORMAT);
         } else {
             $out = null;
         }