From 3179c752f593301436e560c9b8ed17ef2094d3c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Adamczyk?= Date: Wed, 13 Jun 2018 15:25:48 +0200 Subject: [PATCH] EZP-29119: Display proper validation error message when non-image file uploaded in image FieldType --- .../public/js/scripts/fieldType/base/base-preview-field.js | 1 + src/bundle/Resources/views/fieldtypes/edit/ezimage.html.twig | 5 +++++ 2 files changed, 6 insertions(+) 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 index add62ea42f..f8dd226857 100644 --- 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 index c7881e5d09..c753d9dbc3 100644 --- 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 -%}