From b073a0b4efe26b0f1be3239d5b7cfef2fc59202c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 2 Nov 2016 21:53:07 +0100 Subject: Created GroupBundle --- app/AppKernel.php | 1 + app/config/config.yml | 2 +- .../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.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 | 20 ++++++++++++++++++++ src/Wallabag/GroupBundle/WallabagGroupBundle.php | 9 +++++++++ src/Wallabag/UserBundle/Entity/Group.php | 20 -------------------- src/Wallabag/UserBundle/Entity/User.php | 2 +- .../Resources/views/Manage/index.html.twig | 1 + .../Controller/DefaultControllerTest.php | 17 +++++++++++++++++ 17 files changed, 59 insertions(+), 22 deletions(-) create mode 100644 src/Wallabag/GroupBundle/Entity/Group.php create mode 100644 src/Wallabag/GroupBundle/WallabagGroupBundle.php delete mode 100644 src/Wallabag/UserBundle/Entity/Group.php create mode 100644 tests/WallabagGroupBundle/Controller/DefaultControllerTest.php diff --git a/app/AppKernel.php b/app/AppKernel.php index c50783a6..b6babf1d 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -40,6 +40,7 @@ class AppKernel extends Kernel new Wallabag\ImportBundle\WallabagImportBundle(), new Wallabag\AnnotationBundle\WallabagAnnotationBundle(), new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle(), + new Wallabag\GroupBundle\WallabagGroupBundle(), ]; if (in_array($this->getEnvironment(), ['dev', 'test'], true)) { diff --git a/app/config/config.yml b/app/config/config.yml index f1d93aaa..883626fd 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -179,7 +179,7 @@ fos_user: firewall_name: secured_area user_class: Wallabag\UserBundle\Entity\User group: - group_class: Wallabag\UserBundle\Entity\Group + group_class: Wallabag\GroupBundle\Entity\Group registration: confirmation: enabled: "%fosuser_confirmation%" diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 5229ac73..ea7fb086 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml @@ -514,6 +514,7 @@ 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 996f173a..fcda6ae6 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml @@ -514,6 +514,7 @@ 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 aa1cd1a9..54427e23 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml @@ -514,6 +514,7 @@ 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 57e6c029..16c4f3a0 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml @@ -514,6 +514,7 @@ 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.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index 4e26f38c..8dff4c6d 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml @@ -514,6 +514,7 @@ 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 be57e903..1cf70233 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml @@ -514,6 +514,7 @@ 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 00c559ed..d3af4fd5 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml @@ -514,6 +514,7 @@ 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 f16504ed..3952eae8 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml @@ -514,6 +514,7 @@ 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 90a140cd..74f76c72 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml @@ -512,6 +512,7 @@ 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 new file mode 100644 index 00000000..57dc16d1 --- /dev/null +++ b/src/Wallabag/GroupBundle/Entity/Group.php @@ -0,0 +1,20 @@ + + diff --git a/tests/WallabagGroupBundle/Controller/DefaultControllerTest.php b/tests/WallabagGroupBundle/Controller/DefaultControllerTest.php new file mode 100644 index 00000000..f278827b --- /dev/null +++ b/tests/WallabagGroupBundle/Controller/DefaultControllerTest.php @@ -0,0 +1,17 @@ +request('GET', '/'); + + $this->assertContains('Hello World', $client->getResponse()->getContent()); + } +} -- cgit v1.2.3