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

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

Hide file tree

Showing 2 changed files with 42 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,9 +6,50 @@
     {% 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 -%}
 
+{% block form_label -%}
+    {% if label is not same as(false) -%}
+        {%- if compound is defined and compound -%}
+            {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' col-form-label')|trim}) -%}
+        {%- else -%}
+            {%- set label_attr = label_attr|merge({for: id, class: (label_attr.class|default('') ~ ' form-control-label')|trim}) -%}
+        {%- endif -%}
+        {% if required -%}
+            {% set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' required')|trim}) %}
+        {%- endif -%}
+        {% if label is empty -%}
+            {%- if label_format is not empty -%}
+                {% set label = label_format|replace({
+                    '%name%': name,
+                    '%id%': id,
+                }) %}
+            {%- else -%}
+                {% set label = name|humanize %}
+            {%- endif -%}
+        {%- endif -%}
+        <{{ element|default('label') }}
+        {% if label_attr %}
+            {% with { attr: label_attr } %}{{ block('attributes') }}{% endwith %}
+        {% endif %}>
+            {{ translation_domain is same as(false) ? label : label|trans({}, translation_domain) }}
+            {% block form_label_errors %}{{- form_errors(form) -}}{% endblock form_label_errors %}
+        </{{ element|default('label') }}>
+    {%- else -%}
+        {%- if errors|length > 0 -%}
+            <div id="{{ id }}_errors" class="mb-2">
+                {{- form_errors(form) -}}
+            </div>
+        {%- endif -%}
+    {%- endif -%}
+{%- endblock form_label %}
+
 {% block ezimage_preview %}
     {% form_theme form '@EzPlatformAdminUi/fieldtypes/edit/binary_base_fields.html.twig' %}