6 files changed, 31 insertions, 2 deletions

diff --git a/src/Wallabag/UserBundle/Entity/User.php b/src/Wallabag/UserBundle/Entity/User.php
index dc10f1c4..ff658ca5 100644
--- a/src/Wallabag/UserBundle/Entity/User.php
+++ b/src/Wallabag/UserBundle/Entity/User.php
@@ -98,7 +98,7 @@ class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterf
     private $authCode;
 
     /**
-     * @ORM\ManyToMany(targetEntity="Wallabag\GroupBundle\Entity\Group", inversedBy="users")
+     * @ORM\ManyToMany(targetEntity="Wallabag\GroupBundle\Entity\Group", inversedBy="users", cascade={"persist"})
      * @ORM\JoinTable(name="user_group",
      *      joinColumns={@ORM\JoinColumn(name="user_id", referencedColumnName="id")},
      *      inverseJoinColumns={@ORM\JoinColumn(name="group_id", referencedColumnName="id")}
diff --git a/src/Wallabag/UserBundle/Form/NewUserType.php b/src/Wallabag/UserBundle/Form/NewUserType.php
index ad5a2405..ee8324d7 100644
--- a/src/Wallabag/UserBundle/Form/NewUserType.php
+++ b/src/Wallabag/UserBundle/Form/NewUserType.php
@@ -2,6 +2,7 @@
 
 namespace Wallabag\UserBundle\Form;
 
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
 use Symfony\Component\Form\Extension\Core\Type\PasswordType;
@@ -38,6 +39,12 @@ class NewUserType extends AbstractType
             ->add('email', EmailType::class, [
                 'label' => 'user.form.email_label',
             ])
+            ->add('groups', EntityType::class, array(
+                'class' => 'WallabagGroupBundle:Group',
+                'choice_label' => 'name',
+                'multiple' => true,
+                'expanded' => true,
+            ))
             ->add('save', SubmitType::class, [
                 'label' => 'user.form.save',
             ])
diff --git a/src/Wallabag/UserBundle/Form/UserType.php b/src/Wallabag/UserBundle/Form/UserType.php
index d8cdbaf9..04632f2a 100644
--- a/src/Wallabag/UserBundle/Form/UserType.php
+++ b/src/Wallabag/UserBundle/Form/UserType.php
@@ -2,6 +2,7 @@
 
 namespace Wallabag\UserBundle\Form;
 
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -27,6 +28,12 @@ class UserType extends AbstractType
                 'required' => true,
                 'label' => 'user.form.username_label',
             ])
+            ->add('groups', EntityType::class, array(
+                'class' => 'WallabagGroupBundle:Group',
+                'choice_label' => 'name',
+                'multiple' => true,
+                'expanded' => true,
+            ))
             ->add('email', EmailType::class, [
                 'required' => true,
                 'label' => 'user.form.email_label',
diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig
index 3ffd15f5..3c8b9d05 100644
--- a/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig
@@ -41,6 +41,14 @@
 
                                 <div class="row">
                                     <div class="input-field col s12">
+                                        {{ form_label(edit_form.groups) }}
+                                        {{ form_errors(edit_form.groups) }}
+                                        {{ form_widget(edit_form.groups) }}
+                                    </div>
+                                </div>
+
+                                <div class="row">
+                                    <div class="input-field col s12">
                                         {{ form_widget(edit_form.enabled) }}
                                         {{ form_label(edit_form.enabled) }}
                                         {{ form_errors(edit_form.enabled) }}
diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
index 9d5abcaf..5fc6163e 100644
--- a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
@@ -30,7 +30,7 @@
                                 {{ form_rest(searchForm) }}
                             </form>
                         </div>
-
+                        
                     </div>
 
                     <table class="bordered">
diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/new.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/new.html.twig
index 8c894c04..285894ad 100644
--- a/src/Wallabag/UserBundle/Resources/views/Manage/new.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Manage/new.html.twig
@@ -47,6 +47,13 @@
                                     </div>
                                 </div>
 
+                                <div class="row">
+                                    <div class="input-field col s12">
+                                        {{ form_errors(form.groups) }}
+                                        {{ form_widget(form.groups) }}
+                                    </div>
+                                </div>
+
                                 {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
                                 {{ form_rest(form) }}
                             </form>