PIM-2094 : Regroup attributes validation properties in a subpanel

Adrien Pétremann · Adrien Pétremann · commit bc486c9cde8f · 2015-02-06T13:58:53.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -196,6 +196,7 @@
 - PIM-3632: Correctly show scopable attribute icons on scope change
 - PIM-3583: Fix the bad parsed filter value with spaces
 - PIM-3700: Fix comment display on long words
+- PIM-2094: Regroup attributes validation properties in a subpanel
 
 # 1.2.25 (2015-02-04)
 
diff --git a/src/Pim/Bundle/EnrichBundle/Resources/translations/messages.en.yml b/src/Pim/Bundle/EnrichBundle/Resources/translations/messages.en.yml
@@ -830,6 +830,7 @@ pane.accordion:
     locale_values: Locale values
     backend_parameters: Backend parameters
     general_parameters: General parameters
+    validation_parameters: Validation parameters
     label_translations: Label translations
     options: Options
     group_values: Group values
diff --git a/src/Pim/Bundle/EnrichBundle/Resources/views/Attribute/Tab/parameter.html.twig b/src/Pim/Bundle/EnrichBundle/Resources/views/Attribute/Tab/parameter.html.twig
@@ -32,16 +32,18 @@
             </div>
             {{ form_row(form.availableLocales) }}
         {% endif %}
+    {% endset %}
 
-        {% set optionalFields = ['dateMin', 'dateMax', 'negativeAllowed', 'decimalsAllowed', 'numberMin',
-            'numberMax', 'maxCharacters', 'wysiwygEnabled', 'metricFamily', 'defaultMetricUnit', 'maxFileSize',
-            'allowedExtensions', 'validationRule', 'validationRegexp', 'minimumInputLength', 'defaultValue', 'sortOrder'] %}
+    {% set validationParameters %}
+        {% set validationFields = ['dateMin', 'dateMax', 'negativeAllowed', 'decimalsAllowed', 'numberMin',
+        'numberMax', 'maxCharacters', 'wysiwygEnabled', 'metricFamily', 'defaultMetricUnit', 'maxFileSize',
+        'allowedExtensions', 'validationRule', 'validationRegexp', 'minimumInputLength', 'defaultValue', 'sortOrder'] %}
 
         {% for property in form.vars.value.properties|keys %}
-            {% set optionalFields = optionalFields|merge([property]) %}
+            {% set validationFields = validationFields|merge([property]) %}
         {% endfor %}
 
-        {% for field in optionalFields %}
+        {% for field in validationFields %}
             {% if form[field] is defined %}
                 {{ form_row(form[field]) }}
             {% endif %}
@@ -54,5 +56,9 @@
         {{ form_row(form.useableAsGridFilter) }}
     {% endset %}
 
-    {{ elements.accordion({ 'pane.accordion.general_parameters': generalParameters, 'pane.accordion.backend_parameters': backendParameters }) }}
+    {{ elements.accordion({
+        'pane.accordion.general_parameters': generalParameters,
+        'pane.accordion.validation_parameters': validationParameters,
+        'pane.accordion.backend_parameters': backendParameters
+    }) }}
 </div>
