From ce679c236fe7af1cd99ac86f0a79457dc812eac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Grabowski?= <michal.grabowski@ibexa.co>
Date: Sat, 29 Jan 2022 12:13:44 +0100
Subject: [PATCH] IBX-1842: Double message in Button setting in Form Builder
 (#268)

---
 .../ui/component/dropdown/dropdown.html.twig   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown.html.twig
index 5297d751cc..c4e415864e 100644
--- a/src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown.html.twig
@@ -46,15 +46,6 @@
                     </li>
                 {% endif %}
             {% else %}
-                {% for choice in choices_flat %}
-                    {% if custom_form ? value is not empty and choice.value == value : choice is selectedchoice(value) %}
-                        {% include '@ibexadesign/ui/component/dropdown/dropdown_selected_item.html.twig' with {
-                            value: choice.value,
-                            label: _self.get_translated_label(choice.label, translation_domain),
-                        } %}
-                    {% endif %}
-                {% endfor %}
-
                 {% if value is empty %}
                     {% if multiple %}
                         <li class="ibexa-dropdown__selected-item ibexa-dropdown__selected-item--predefined ibexa-dropdown__selected-placeholder">
@@ -79,6 +70,15 @@
                             } %}
                         {% endif %}
                     {% endif %}
+                {% else %}
+                    {% for choice in choices_flat %}
+                        {% if custom_form ? choice.value == value : choice is selectedchoice(value) %}
+                            {% include '@ibexadesign/ui/component/dropdown/dropdown_selected_item.html.twig' with {
+                                value: choice.value,
+                                label: _self.get_translated_label(choice.label, translation_domain),
+                            } %}
+                        {% endif %}
+                    {% endfor %}
                 {% endif %}
             {% endif %}