EZP-29119: Fixed form errors and label for all fieldtypes

ezsystems · Jun 18, 2018 · 0179a55 · 0179a55
1 parent 5b45ed0
commit 0179a55
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 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/content/form_fields.html.twig b/src/bundle/Resources/views/content/form_fields.html.twig
@@ -87,9 +87,16 @@
         {% set wrapper_attr = wrapper_attr|merge({'title': field_type_descriptions[fieldtype.vars.languageCode]}) %}
     {% endif %}
 
+    {# BC: to maintain BC we have to map errors which orginated from compound fieldtypes #}
+    {% for error in form.parent.parent.parent.vars.errors %}
+        {% if error.origin == form.vars.errors.form %}
+            {% set errors = errors|default([])|merge([error]) %}
+        {% endif %}
+    {% endfor %}
+
     <div {% with { attr: wrapper_attr } %}{{ block('attributes') }}{% endwith %}>
         <div{% with { attr: label_wrapper_attr } %}{{ block('attributes') }}{% endwith %}>
-            {{ block('form_label') }}
+            {% with { 'compound': false } %}{{- block('form_label') }}{% endwith %}
             {{ block('form_errors') }}
         </div>
 

diff --git a/src/bundle/Resources/views/fieldtypes/edit/binary_base.html.twig b/src/bundle/Resources/views/fieldtypes/edit/binary_base.html.twig
@@ -6,7 +6,7 @@
     {% set wrapper_attr = wrapper_attr|default({})|merge({'class': (wrapper_attr.class|default('') ~ ' ez-field-edit--with-preview')|trim}) %}
     {% set preview_attr = preview_attr|default({})|merge({'class': (preview_attr.class|default('') ~ ' ez-field-edit__preview')|trim}) %}
     {% set widget_wrapper_attr = widget_wrapper_attr|default({})|merge({'class': (widget_wrapper_attr.class|default('') ~ ' ez-field-edit__data')|trim}) %}
-    {% if file_is_empty %}
+    {% if file_is_empty or errors|length > 0 %}
         {% set preview_attr = preview_attr|default({})|merge({'hidden': 'hidden'}) %}
     {% else %}
         {% set widget_wrapper_attr = widget_wrapper_attr|merge({'hidden': 'hidden'}) %}