Merge branch '4.6' into main

ibexa · Mar 28, 2024 · 6c01c93 · 6c01c93
2 parents ae4d819 + b0042b2
commit 6c01c93
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezimageasset.js b/src/bundle/Resources/public/js/scripts/fieldType/ezimageasset.js
@@ -96,6 +96,18 @@
                 return field.fieldDefinitionIdentifier === imageAssetMapping['contentFieldIdentifier'];
             });
 
+            if (imageField.fieldValue === null) {
+                showErrorNotification(
+                    Translator.trans(
+                        /* @Desc("The chosen asset has no image data available.") */ 'ezimageasset.empty_data.message.error',
+                        {},
+                        'fieldtypes_edit',
+                    ),
+                );
+
+                return;
+            }
+
             this.updateData(
                 response.ContentInfo.Content._id,
                 response.ContentInfo.Content.TranslatedName,

diff --git a/src/bundle/Resources/translations/ibexa_fieldtypes_edit.en.xliff b/src/bundle/Resources/translations/ibexa_fieldtypes_edit.en.xliff
@@ -26,6 +26,11 @@
         <target state="new">The image has been published and can now be reused</target>
         <note>key: ezimageasset.create.message.success</note>
       </trans-unit>
+      <trans-unit id="75c1175bca5f2a2334ffe321afdaedf7fa6887bd" resname="ezimageasset.empty_data.message.error">
+        <source>The chosen asset has no image data available.</source>
+        <target state="new">The chosen asset has no image data available.</target>
+        <note>key: ezimageasset.empty_data.message.error</note>
+      </trans-unit>
       <trans-unit id="d10ad93186c93b5a79a7aa921eb874b7df716935" resname="ezmaplocation.create.message.error">
         <source>Area below needs correction</source>
         <target state="new">Area below needs correction</target>