fix(admin/asset-field): asset field remove 'sha1' and '_hash' field (e…

…ms-project#1011)
theus77 · Sep 19, 2024 · 3a8a094 · 3a8a094
1 parent 799f1c1
commit 3a8a094
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/EMS/core-bundle/src/Form/DataField/AssetFieldType.php b/EMS/core-bundle/src/Form/DataField/AssetFieldType.php
@@ -51,6 +51,9 @@ public static function loadFromDb(array &$data): void
                      EmsFields::CONTENT_FILE_SIZE_FIELD_ => EmsFields::CONTENT_FILE_SIZE_FIELD,
                      EmsFields::CONTENT_MIME_TYPE_FIELD_ => EmsFields::CONTENT_MIME_TYPE_FIELD,
                  ] as $newField => $oldField) {
+            if (!isset($data[$newField]) && isset($data[$oldField])) {
+                $data[$newField] = $data[$oldField];
+            }
             if (!isset($data[$newField])) {
                 continue;
             }
@@ -59,11 +62,13 @@ public static function loadFromDb(array &$data): void
         foreach ($data as $id => $content) {
             if (!\in_array($id, [EmsFields::CONTENT_FILE_HASH_FIELD_, EmsFields::CONTENT_FILE_NAME_FIELD_, EmsFields::CONTENT_FILE_SIZE_FIELD_, EmsFields::CONTENT_MIME_TYPE_FIELD_,  EmsFields::CONTENT_FILE_HASH_FIELD, EmsFields::CONTENT_FILE_NAME_FIELD, EmsFields::CONTENT_FILE_SIZE_FIELD, EmsFields::CONTENT_MIME_TYPE_FIELD,  EmsFields::CONTENT_IMAGE_RESIZED_HASH_FIELD, EmsFields::CONTENT_FILE_DATE, EmsFields::CONTENT_FILE_AUTHOR, EmsFields::CONTENT_FILE_LANGUAGE, EmsFields::CONTENT_FILE_CONTENT, EmsFields::CONTENT_FILE_TITLE], true)) {
                 unset($data[$id]);
-            } elseif (EmsFields::CONTENT_FILE_HASH_FIELD_ !== $id && empty($data[$id])) {
-                unset($data[EmsFields::CONTENT_FILE_HASH_FIELD_]);
-                unset($data[EmsFields::CONTENT_FILE_HASH_FIELD]);
             }
         }
+
+        if (empty($data[EmsFields::CONTENT_FILE_HASH_FIELD_])) {
+            unset($data[EmsFields::CONTENT_FILE_HASH_FIELD_]);
+            unset($data[EmsFields::CONTENT_FILE_HASH_FIELD]);
+        }
     }
 
     /**