3 files changed, 102 insertions, 0 deletions

diff --git a/src/Wallabag/GroupBundle/Form/GroupType.php b/src/Wallabag/GroupBundle/Form/GroupType.php
index c2ad764b..c708bdb8 100644
--- a/src/Wallabag/GroupBundle/Form/GroupType.php
+++ b/src/Wallabag/GroupBundle/Form/GroupType.php
@@ -3,10 +3,13 @@
 namespace Wallabag\GroupBundle\Form;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\PasswordType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Wallabag\GroupBundle\Entity\Group;
 
 class GroupType extends AbstractType
 {
@@ -21,6 +24,31 @@ class GroupType extends AbstractType
                 'required' => false,
                 'label' => 'group.form.name_label',
             ])
+            ->add('defaultRole', ChoiceType::class, [
+                'label' => 'group.form.role_label',
+                'choices' => [
+                    'group.roles.readonly' => Group::ROLE_READ_ONLY,
+                    'group.roles.write' => Group::ROLE_WRITE,
+                    'group.roles.manage_entries' => Group::ROLE_MANAGE_ENTRIES,
+                    'group.roles.manage_users' => Group::ROLE_MANAGE_USERS,
+                    'group.roles.admin' => Group::ROLE_ADMIN,
+                ],
+            ])
+            ->add('acceptSystem', ChoiceType::class, [
+                'label' => 'group.form.access_label',
+                'choices' => [
+                    'group.access.open' => Group::ACCESS_OPEN,
+                    'group.access.request' => Group::ACCESS_REQUEST,
+                    'group.access.password' => Group::ACCESS_PASSWORD,
+                    'group.access.invitation' => Group::ACCESS_INVITATION_ONLY,
+                    'group.access.hidden' => Group::ACCESS_HIDDEN,
+                ],
+            ])
+            ->add('plainPassword', PasswordType::class, [
+                'label' => 'group.form.password_label',
+                'required' => false,
+                'attr' => ['autocomplete' => 'off'],
+            ])
             ->add('save', SubmitType::class, [
                 'label' => 'group.form.save',
             ])
diff --git a/src/Wallabag/GroupBundle/Form/NewGroupType.php b/src/Wallabag/GroupBundle/Form/NewGroupType.php
index 29b20fe0..55eebc46 100644
--- a/src/Wallabag/GroupBundle/Form/NewGroupType.php
+++ b/src/Wallabag/GroupBundle/Form/NewGroupType.php
@@ -3,10 +3,13 @@
 namespace Wallabag\GroupBundle\Form;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\PasswordType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Wallabag\GroupBundle\Entity\Group;
 
 class NewGroupType extends AbstractType
 {
@@ -17,6 +20,31 @@ class NewGroupType extends AbstractType
                 'required' => true,
                 'label' => 'group.form.name_label',
             ])
+            ->add('defaultRole', ChoiceType::class, [
+                'label' => 'group.form.role_label',
+                'choices' => [
+                    'group.roles.readonly' => Group::ROLE_READ_ONLY,
+                    'group.roles.write' => Group::ROLE_WRITE,
+                    'group.roles.manage_entries' => Group::ROLE_MANAGE_ENTRIES,
+                    'group.roles.manage_users' => Group::ROLE_MANAGE_USERS,
+                    'group.roles.admin' => Group::ROLE_ADMIN,
+                ],
+            ])
+            ->add('acceptSystem', ChoiceType::class, [
+                'label' => 'group.form.access_label',
+                'choices' => [
+                    'group.access.open' => Group::ACCESS_OPEN,
+                    'group.access.request' => Group::ACCESS_REQUEST,
+                    'group.access.password' => Group::ACCESS_PASSWORD,
+                    'group.access.invitation' => Group::ACCESS_INVITATION_ONLY,
+                    'group.access.hidden' => Group::ACCESS_HIDDEN,
+                ],
+            ])
+            ->add('plainPassword', PasswordType::class, [
+                'label' => 'group.form.password_label',
+                'required' => false,
+                'attr' => ['autocomplete' => 'off'],
+            ])
             ->add('save', SubmitType::class, [
                 'label' => 'group.form.save',
             ])
diff --git a/src/Wallabag/GroupBundle/Form/UserGroupType.php b/src/Wallabag/GroupBundle/Form/UserGroupType.php
new file mode 100644
index 00000000..e8f814e4
--- /dev/null
+++ b/src/Wallabag/GroupBundle/Form/UserGroupType.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Wallabag\GroupBundle\Form\Type;
+
+use Wallabag\GroupBundle\Entity\Group;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+
+class UserGroupType extends AbstractType
+{
+    /**
+     * @param FormBuilderInterface $builder
+     * @param array                $options
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('role', ChoiceType::class, [
+                'label' => 'group.edit_user.role',
+                'choices' => [
+                    'group.roles.readonly' => Group::ROLE_READ_ONLY,
+                    'group.roles.write' => Group::ROLE_WRITE,
+                    'group.roles.manage_prez' => Group::ROLE_MANAGE_PREZ,
+                    'group.roles.manage_users' => Group::ROLE_MANAGE_USERS,
+                    'group.roles.admin' => Group::ROLE_ADMIN,
+                ],
+            ])
+            ->add('save', SubmitType::class, [
+                'label' => 'user.form.save',
+            ])
+        ;
+    }
+
+    /**
+     * @param OptionsResolver $resolver
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults(array(
+            'data_class' => 'Strut\StrutBundle\Entity\UserGroup',
+        ));
+    }
+}