diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-09-30 20:09:06 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-02 11:08:53 +0200 |
commit | 152fcccd4489378a8ed9391e3e191df4aeba6435 (patch) | |
tree | c64685be77d9e850d5370c66fac3ffb5b12f095b /src/Wallabag/CoreBundle/Controller | |
parent | 52c1fc7449554c942c945e6c740e0e11d2f60a0d (diff) | |
download | wallabag-152fcccd4489378a8ed9391e3e191df4aeba6435.tar.gz wallabag-152fcccd4489378a8ed9391e3e191df4aeba6435.tar.zst wallabag-152fcccd4489378a8ed9391e3e191df4aeba6435.zip |
Add users management UI
- remove the “add a user” from the config page
- add a CRUD on user
- fix some missing translations (+ bad indentation)
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller')
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/ConfigController.php | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index f1e212d9..51d8bdd1 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php | |||
@@ -13,7 +13,6 @@ use Wallabag\CoreBundle\Entity\Config; | |||
13 | use Wallabag\CoreBundle\Entity\TaggingRule; | 13 | use Wallabag\CoreBundle\Entity\TaggingRule; |
14 | use Wallabag\CoreBundle\Form\Type\ConfigType; | 14 | use Wallabag\CoreBundle\Form\Type\ConfigType; |
15 | use Wallabag\CoreBundle\Form\Type\ChangePasswordType; | 15 | use Wallabag\CoreBundle\Form\Type\ChangePasswordType; |
16 | use Wallabag\CoreBundle\Form\Type\NewUserType; | ||
17 | use Wallabag\CoreBundle\Form\Type\RssType; | 16 | use Wallabag\CoreBundle\Form\Type\RssType; |
18 | use Wallabag\CoreBundle\Form\Type\TaggingRuleType; | 17 | use Wallabag\CoreBundle\Form\Type\TaggingRuleType; |
19 | use Wallabag\CoreBundle\Form\Type\UserInformationType; | 18 | use Wallabag\CoreBundle\Form\Type\UserInformationType; |
@@ -138,38 +137,12 @@ class ConfigController extends Controller | |||
138 | return $this->redirect($this->generateUrl('config').'#set5'); | 137 | return $this->redirect($this->generateUrl('config').'#set5'); |
139 | } | 138 | } |
140 | 139 | ||
141 | // handle adding new user | ||
142 | $newUser = $userManager->createUser(); | ||
143 | // enable created user by default | ||
144 | $newUser->setEnabled(true); | ||
145 | $newUserForm = $this->createForm(NewUserType::class, $newUser, [ | ||
146 | 'validation_groups' => ['Profile'], | ||
147 | 'action' => $this->generateUrl('config').'#set6', | ||
148 | ]); | ||
149 | $newUserForm->handleRequest($request); | ||
150 | |||
151 | if ($newUserForm->isValid() && $this->get('security.authorization_checker')->isGranted('ROLE_SUPER_ADMIN')) { | ||
152 | $userManager->updateUser($newUser); | ||
153 | |||
154 | // dispatch a created event so the associated config will be created | ||
155 | $event = new UserEvent($newUser, $request); | ||
156 | $this->get('event_dispatcher')->dispatch(FOSUserEvents::USER_CREATED, $event); | ||
157 | |||
158 | $this->get('session')->getFlashBag()->add( | ||
159 | 'notice', | ||
160 | $this->get('translator')->trans('flashes.config.notice.user_added', ['%username%' => $newUser->getUsername()]) | ||
161 | ); | ||
162 | |||
163 | return $this->redirect($this->generateUrl('config').'#set6'); | ||
164 | } | ||
165 | |||
166 | return $this->render('WallabagCoreBundle:Config:index.html.twig', [ | 140 | return $this->render('WallabagCoreBundle:Config:index.html.twig', [ |
167 | 'form' => [ | 141 | 'form' => [ |
168 | 'config' => $configForm->createView(), | 142 | 'config' => $configForm->createView(), |
169 | 'rss' => $rssForm->createView(), | 143 | 'rss' => $rssForm->createView(), |
170 | 'pwd' => $pwdForm->createView(), | 144 | 'pwd' => $pwdForm->createView(), |
171 | 'user' => $userForm->createView(), | 145 | 'user' => $userForm->createView(), |
172 | 'new_user' => $newUserForm->createView(), | ||
173 | 'new_tagging_rule' => $newTaggingRule->createView(), | 146 | 'new_tagging_rule' => $newTaggingRule->createView(), |
174 | ], | 147 | ], |
175 | 'rss' => [ | 148 | 'rss' => [ |