Fix resetting a parent group to None

diff --git a/galette/lib/Galette/Controllers/Crud/GroupsController.php b/galette/lib/Galette/Controllers/Crud/GroupsController.php
index e89e280172625053203dc4ea9ad7120c2ea989ec..4cd99d428e470e1fd4fa950b3a2a2cbde584b885 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'] !== '') {
+            if ($post['parent_group'] !== ('' or 'none')) {
                 $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 3c9292042ca2a4607f572927acfd9945e0529c1f..f1ee36963d397a02ba96c69665382990db315653 100644 (file)
--- a/galette/templates/default/elements/group.html.twig
+++ b/galette/templates/default/elements/group.html.twig
@@ -37,7 +37,7 @@
                     <label for="parent_group">{{ _T("Parent group:") }}</label>
                 {% if can_edit and parent_groups|length > 0 %}
                     <select name="parent_group" id="parent_group" class="ui search dropdown nochosen">
-                        <option value="">{{ _T("None") }}</option>
+                        <option value="none">{{ _T("None") }}</option>
                         {% 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>
                         {% endfor %}
@@ -48,7 +48,7 @@
                         {{ pgroup.getName() }}
                         <input type="hidden" name="parent_group" value="{{ pgroup.getId() }}"/>
                     {% else %}
-                        -
+                        {{ _T("None") }}
                         <input type="hidden" name="parent_group" value=""/>
                     {% endif %}
                     </span>