EZP-29119: Display proper validation error message when non-image fil…

…e uploaded in image FieldType
ezsystems · Jun 15, 2018 · 3179c75 · 3179c75
1 parent e76fd81
commit 3179c75
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/bundle/Resources/public/js/scripts/fieldType/base/base-preview-field.js b/src/bundle/Resources/public/js/scripts/fieldType/base/base-preview-field.js
@@ -179,6 +179,7 @@
             this.fieldContainer.querySelector(SELECTOR_DATA).removeAttribute('hidden');
             this.fieldContainer.querySelector(SELECTOR_PREVIEW).setAttribute('hidden', true);
             this.fieldContainer.classList.remove('is-invalid');
+            [...this.fieldContainer.querySelectorAll('.ez-field-edit__error')].forEach(element => element.remove());
 
             btnRemove.removeEventListener('click', this.handleRemoveFile);
 

diff --git a/src/bundle/Resources/views/fieldtypes/edit/ezimage.html.twig b/src/bundle/Resources/views/fieldtypes/edit/ezimage.html.twig
@@ -6,6 +6,11 @@
     {% set preview_block_name = 'ezimage_preview' %}
     {% set max_file_size = min(form.parent.vars.value.fieldDefinition.validatorConfiguration.FileSizeValidator.maxFileSize * 1024 * 1024, max_upload_size|round) %}
     {% set attr = attr|merge({'accept': 'image/*'}) %}
+    {% for error in form.parent.parent.parent.vars.errors %}
+        {% if error.origin == form.vars.errors.form %}
+            {% set errors = errors|default({})|merge({0: error}) %}
+        {% endif %}
+    {% endfor %}
     {{ block('binary_base_row') }}
 {%- endblock -%}