Added group in user form

4 files changed, 23 insertions, 35 deletions

diff --git a/src/Wallabag/GroupBundle/Entity/Group.php b/src/Wallabag/GroupBundle/Entity/Group.php
index e889f74e..1381d1ea 100644
--- a/src/Wallabag/GroupBundle/Entity/Group.php
+++ b/src/Wallabag/GroupBundle/Entity/Group.php
@@ -2,6 +2,7 @@
 
 namespace Wallabag\GroupBundle\Entity;
 
+use Doctrine\Common\Collections\ArrayCollection;
 use FOS\UserBundle\Model\Group as BaseGroup;
 use Doctrine\ORM\Mapping as ORM;
 use Wallabag\UserBundle\Entity\User;
diff --git a/src/Wallabag/GroupBundle/Form/GroupType.php b/src/Wallabag/GroupBundle/Form/GroupType.php
index 749c15e9..c2ad764b 100644
--- a/src/Wallabag/GroupBundle/Form/GroupType.php
+++ b/src/Wallabag/GroupBundle/Form/GroupType.php
@@ -2,7 +2,6 @@
 
 namespace Wallabag\GroupBundle\Form;
 
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -22,12 +21,6 @@ class GroupType extends AbstractType
                 'required' => false,
                 'label' => 'group.form.name_label',
             ])
-            ->add('users', EntityType::class, array(
-                'class' => 'WallabagUserBundle:User',
-                'choice_label' => 'username',
-                'multiple' => true,
-                'expanded' => true,
-            ))
             ->add('save', SubmitType::class, [
                 'label' => 'group.form.save',
             ])
diff --git a/src/Wallabag/GroupBundle/Resources/views/Manage/edit.html.twig b/src/Wallabag/GroupBundle/Resources/views/Manage/edit.html.twig
index 791a7a18..7de68c35 100644
--- a/src/Wallabag/GroupBundle/Resources/views/Manage/edit.html.twig
+++ b/src/Wallabag/GroupBundle/Resources/views/Manage/edit.html.twig
@@ -23,14 +23,6 @@
                                     </div>
                                 </div>
 
-                                <div class="row">
-                                    <div class="input-field col s12">
-                                        {{ form_label(edit_form.users) }}
-                                        {{ form_errors(edit_form.users) }}
-                                        {{ form_widget(edit_form.users) }}
-                                    </div>
-                                </div>
-
                                 <br/>
 
                                 {{ form_widget(edit_form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
diff --git a/src/Wallabag/GroupBundle/Resources/views/Manage/index.html.twig b/src/Wallabag/GroupBundle/Resources/views/Manage/index.html.twig
index ce2a4556..58af3a75 100644
--- a/src/Wallabag/GroupBundle/Resources/views/Manage/index.html.twig
+++ b/src/Wallabag/GroupBundle/Resources/views/Manage/index.html.twig
@@ -11,26 +11,28 @@
                     <div class="input-field col s12">
                         <p class="help">{{ 'group.description'|trans|raw }}</p>
 
-                        <table class="bordered">
-                            <thead>
-                                <tr>
-                                    <th>{{ 'group.form.name_label'|trans }}</th>
-                                    <th>{{ 'group.form.roles_label'|trans }}</th>
-                                    <th>{{ 'group.list.actions'|trans }}</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                            {% for group in groups %}
-                                <tr>
-                                    <td>{{ group.name }}</td>
-                                    <td></td>
-                                    <td>
-                                        <a href="{{ path('group_edit', { 'id': group.id }) }}">{{ 'group.list.edit_action'|trans }}</a>
-                                    </td>
-                                </tr>
-                            {% endfor %}
-                            </tbody>
-                        </table>
+                        {% if groups is not empty %}
+                            <table class="bordered">
+                                <thead>
+                                    <tr>
+                                        <th>{{ 'group.form.name_label'|trans }}</th>
+                                        <th>{{ 'group.form.roles_label'|trans }}</th>
+                                        <th>{{ 'group.list.actions'|trans }}</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                {% for group in groups %}
+                                    <tr>
+                                        <td>{{ group.name }}</td>
+                                        <td></td>
+                                        <td>
+                                            <a href="{{ path('group_edit', { 'id': group.id }) }}">{{ 'group.list.edit_action'|trans }}</a>
+                                        </td>
+                                    </tr>
+                                {% endfor %}
+                                </tbody>
+                            </table>
+                        {% endif %}
                         <br />
                         <p>
                             <a href="{{ path('group_new') }}" class="waves-effect waves-light btn">{{ 'group.list.create_new_one'|trans }}</a>