Initialize group parent search dropdown with HTML

fixes #1708

diff --git a/galette/lib/Galette/Controllers/Crud/GroupsController.php b/galette/lib/Galette/Controllers/Crud/GroupsController.php
index 4cd99d428e470e1fd4fa950b3a2a2cbde584b885..e89e280172625053203dc4ea9ad7120c2ea989ec 100644 (file)
--- a/galette/lib/Galette/Controllers/Crud/GroupsController.php
+++ b/galette/lib/Galette/Controllers/Crud/GroupsController.php
@@ -356,7 +356,7 @@ class GroupsController extends CrudController
 
         $group->setName($post['group_name']);
         try {
-            if ($post['parent_group'] !== ('' or 'none')) {
+            if ($post['parent_group'] !== '') {
                 $group->setParentGroup((int)$post['parent_group']);
             } else {
                 $group->detach();

diff --git a/galette/templates/default/elements/group.html.twig b/galette/templates/default/elements/group.html.twig
index 19fef5c643d38df596c2f83a4aa298162d9262ed..d5c16785626899f066a59a1ecb2f870356dbe1f4 100644 (file)
--- a/galette/templates/default/elements/group.html.twig
+++ b/galette/templates/default/elements/group.html.twig
@@ -40,12 +40,17 @@
                         {{ pgroup.getName() }}
                         <input type="hidden" name="parent_group" value="{{ pgroup.getId() }}"/>
                     {% else %}
-                        <select name="parent_group" id="parent_group" class="ui search dropdown nochosen">
-                            <option value="none">{{ _T("None") }}</option>
+                        <div class="ui search selection dropdown nochosen">
+                            <input type="hidden" name="parent_group" id="parent_group" value="{% if pgroup is defined %}{{ pgroup.getId() }}{% endif %}">
+                            <i class="dropdown icon"></i>
+                            <div class="text">{% if pgroup is defined %}{{ pgroup.getName() }}{% endif %}</div>
+                            <div class="menu">
+                                <div class="item" data-value="">{{ _T("None") }}</div>
                             {% for g in parent_groups %}
-                                <option value="{{ g.getId() }}"{% if pgroup is defined and pgroup.getId() == g.getId() %} selected="selected"{% endif %}>{{ g.getIndentName()|raw }}</option>
+                                <div class="item" data-value="{{ g.getId() }}">{{ g.getIndentName()|raw }}</div>
                             {% endfor %}
-                        </select>
+                            </div>
+                        </div>
                     {% endif %}
                 {% else %}
                     <span>