From 6a50b4ccb58860f5db872745c7f1894c75cdd027 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 9 Nov 2016 13:32:58 +0100 Subject: Added group in user form --- .../Resources/translations/messages.da.yml | 1 - .../Resources/translations/messages.de.yml | 1 - .../Resources/translations/messages.en.yml | 1 - .../Resources/translations/messages.fa.yml | 1 - .../Resources/translations/messages.fr.yml | 1 - .../Resources/translations/messages.it.yml | 1 - .../Resources/translations/messages.oc.yml | 1 - .../Resources/translations/messages.pl.yml | 1 - .../Resources/translations/messages.ro.yml | 1 - .../Resources/translations/messages.tr.yml | 1 - src/Wallabag/GroupBundle/Entity/Group.php | 1 + src/Wallabag/GroupBundle/Form/GroupType.php | 7 ---- .../Resources/views/Manage/edit.html.twig | 8 ----- .../Resources/views/Manage/index.html.twig | 42 +++++++++++----------- src/Wallabag/UserBundle/Entity/User.php | 2 +- src/Wallabag/UserBundle/Form/NewUserType.php | 7 ++++ src/Wallabag/UserBundle/Form/UserType.php | 7 ++++ .../Resources/views/Manage/edit.html.twig | 8 +++++ .../Resources/views/Manage/index.html.twig | 2 +- .../Resources/views/Manage/new.html.twig | 7 ++++ 20 files changed, 54 insertions(+), 47 deletions(-) diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 8d023efa..7068969b 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml @@ -534,7 +534,6 @@ user: repeat_new_password_label: 'Gentag adgangskode' plain_password_label: '????' email_label: 'Emailadresse' - # group: 'Group' # enabled_label: 'Enabled' # last_login_label: 'Last login' # twofactor_label: Two factor authentication diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index 44f11ab4..976aa511 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml @@ -534,7 +534,6 @@ user: repeat_new_password_label: 'Neues Kennwort wiederholen' plain_password_label: '????' email_label: 'E-Mail-Adresse' - # group: 'Group' enabled_label: 'Aktiviert' last_login_label: 'Letzter Login' twofactor_label: Zwei-Faktor-Authentifizierung diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 0d8cde7a..8f507c40 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml @@ -534,7 +534,6 @@ user: repeat_new_password_label: 'Repeat new password' plain_password_label: '????' email_label: 'Email' - group: 'Group' enabled_label: 'Enabled' last_login_label: 'Last login' twofactor_label: Two factor authentication diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index 61fe8a17..45711a84 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml @@ -534,7 +534,6 @@ user: repeat_new_password_label: 'رمز تازه را دوباره بنویسید' plain_password_label: '????' email_label: 'نشانی ایمیل' - # group: 'Group' # enabled_label: 'Enabled' # last_login_label: 'Last login' # twofactor_label: Two factor authentication diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index be8751ff..beb8f324 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml @@ -16,7 +16,6 @@ security: menu: left: -<<<<<<< 5da541f5bdeec8ad968ba75a30ca2d19ea64d1f2 unread: "Non lus" starred: "Favoris" archive: "Lus" diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index a909d2c1..c5634983 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml @@ -534,7 +534,6 @@ user: repeat_new_password_label: 'Ripeti password' plain_password_label: '????' email_label: 'E-mail' - # group: 'Group' # enabled_label: 'Enabled' # last_login_label: 'Last login' # twofactor_label: Two factor authentication diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index a3c935ca..dfc28896 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml @@ -535,7 +535,6 @@ user: repeat_new_password_label: 'Confirmatz vòstre novèl senhal' plain_password_label: 'Senhal en clar' email_label: 'Adreça de corrièl' - # group: 'Group' enabled_label: 'Actiu' last_login_label: 'Darrièra connexion' twofactor_label: 'Autentificacion doble-factor' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index d252d448..1b376073 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml @@ -534,7 +534,6 @@ user: repeat_new_password_label: 'Powtórz nowe hasło' plain_password_label: 'Jawne hasło' email_label: 'Adres email' - # group: 'Group' enabled_label: 'Włączony' last_login_label: 'Ostatnie logowanie' twofactor_label: Autoryzacja dwuetapowa diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index 29ae81cd..1f89627d 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml @@ -534,7 +534,6 @@ user: repeat_new_password_label: 'Repeat new password' plain_password_label: '????' email_label: 'E-mail' - # group: 'Group' # enabled_label: 'Enabled' # last_login_label: 'Last login' # twofactor_label: Two factor authentication diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index 4ac867a0..932ae549 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml @@ -513,7 +513,6 @@ user: repeat_new_password_label: 'Yeni şifrenin tekrarı' plain_password_label: '????' email_label: 'E-posta' - # group: 'Group' # enabled_label: 'Enabled' # last_login_label: 'Last login' # twofactor_label: Two factor authentication 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 @@ -
-
- {{ form_label(edit_form.users) }} - {{ form_errors(edit_form.users) }} - {{ form_widget(edit_form.users) }} -
-
-
{{ 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 @@

{{ 'group.description'|trans|raw }}

- - - - - - - - - - {% for group in groups %} - - - - - - {% endfor %} - -
{{ 'group.form.name_label'|trans }}{{ 'group.form.roles_label'|trans }}{{ 'group.list.actions'|trans }}
{{ group.name }} - {{ 'group.list.edit_action'|trans }} -
+ {% if groups is not empty %} + + + + + + + + + + {% for group in groups %} + + + + + + {% endfor %} + +
{{ 'group.form.name_label'|trans }}{{ 'group.form.roles_label'|trans }}{{ 'group.list.actions'|trans }}
{{ group.name }} + {{ 'group.list.edit_action'|trans }} +
+ {% endif %}

{{ 'group.list.create_new_one'|trans }} 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 @@ -39,6 +39,14 @@

+
+
+ {{ form_label(edit_form.groups) }} + {{ form_errors(edit_form.groups) }} + {{ form_widget(edit_form.groups) }} +
+
+
{{ form_widget(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) }}
- +
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 @@ +
+
+ {{ form_errors(form.groups) }} + {{ form_widget(form.groups) }} +
+
+ {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} {{ form_rest(form) }} -- cgit v1.2.3