Merge pull request #7 from mybuilder/separate-placeholder-empty-value

Separate out check for placeholder and empty_value
mybuilder · Oct 17, 2018 · 08c31ae · 08c31ae
2 parents 2b30c3b + 23174ef
commit 08c31ae
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/Resources/views/Form/fields.html.twig b/Resources/views/Form/fields.html.twig
@@ -83,7 +83,9 @@
             {{ block('widget_addon') }}
         {% endif %}
         <select {{ block('widget_attributes') }}{% if multiple %} multiple="multiple"{% endif %}>
-            {% if (placeholder is defined and placeholder is not none) or (empty_value is defined and empty_value is not none) %}
+            {% if placeholder is defined and placeholder is not none %}
+                <option value=""{% if required and value is empty %} selected="selected"{% endif %}>{{ placeholder|trans({}, translation_domain) }}</option>
+            {% elseif empty_value is defined and empty_value is not none %}
                 <option value=""{% if required and value is empty %} selected="selected"{% endif %}>{{ empty_value|trans({}, translation_domain) }}</option>
             {% endif %}
             {% if preferred_choices|length > 0 %}