diff options
Diffstat (limited to 'src/Wallabag/GroupBundle/Controller/ManageController.php')
-rw-r--r-- | src/Wallabag/GroupBundle/Controller/ManageController.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/Wallabag/GroupBundle/Controller/ManageController.php b/src/Wallabag/GroupBundle/Controller/ManageController.php index 94196040..31a0c7b1 100644 --- a/src/Wallabag/GroupBundle/Controller/ManageController.php +++ b/src/Wallabag/GroupBundle/Controller/ManageController.php | |||
@@ -25,7 +25,7 @@ class ManageController extends Controller | |||
25 | /** | 25 | /** |
26 | * Lists all public Group entities. | 26 | * Lists all public Group entities. |
27 | * | 27 | * |
28 | * @Route("/{page}", name="group_index", defaults={"page" = "1"}) | 28 | * @Route("/{page}", requirements={"page" = "\d+"}, name="group_index", defaults={"page" = "1"}) |
29 | * @Method("GET") | 29 | * @Method("GET") |
30 | */ | 30 | */ |
31 | public function indexAction($page = 1) | 31 | public function indexAction($page = 1) |
@@ -182,24 +182,26 @@ class ManageController extends Controller | |||
182 | 182 | ||
183 | /** | 183 | /** |
184 | * @Route("/group-user-exclude/{group}/{user}", name="group-user-exclude") | 184 | * @Route("/group-user-exclude/{group}/{user}", name="group-user-exclude") |
185 | * | ||
185 | * @param Group $group | 186 | * @param Group $group |
186 | * @param User $user | 187 | * @param User $user |
188 | * | ||
187 | * @return Response | 189 | * @return Response |
188 | */ | 190 | */ |
189 | public function excludeMemberAction(Group $group, User $user) | 191 | public function excludeMemberAction(Group $group, User $user) |
190 | { | 192 | { |
191 | $logger = $this->get('logger'); | 193 | $logger = $this->get('logger'); |
192 | $logger->info('User ' . $this->getUser()->getUsername() . ' wants to exclude user ' . $user->getUsername() . ' from group ' . $group->getName()); | 194 | $logger->info('User '.$this->getUser()->getUsername().' wants to exclude user '.$user->getUsername().' from group '.$group->getName()); |
193 | 195 | ||
194 | if (!$this->getUser()->inGroup($group) || $this->getUser()->getGroupRoleForUser($group) < Group::ROLE_MANAGE_USERS) { | 196 | if (!$this->getUser()->inGroup($group) || $this->getUser()->getGroupRoleForUser($group) < Group::ROLE_MANAGE_USERS) { |
195 | $logger->info('User ' . $this->getUser()->getUsername() . ' has not enough rights on group ' . $group->getName() . ' to exclude user ' . $user->getUsername()); | 197 | $logger->info('User '.$this->getUser()->getUsername().' has not enough rights on group '.$group->getName().' to exclude user '.$user->getUsername()); |
196 | throw $this->createAccessDeniedException(); | 198 | throw $this->createAccessDeniedException(); |
197 | } | 199 | } |
198 | 200 | ||
199 | if ($user->inGroup($group) && $user->getGroupRoleForUser($group) < Group::ROLE_ADMIN) { | 201 | if ($user->inGroup($group) && $user->getGroupRoleForUser($group) < Group::ROLE_ADMIN) { |
200 | $em = $this->getDoctrine()->getManager(); | 202 | $em = $this->getDoctrine()->getManager(); |
201 | 203 | ||
202 | $logger->info('Removing user ' . $this->getUser()->getUsername() . ' from group ' . $group->getName()); | 204 | $logger->info('Removing user '.$this->getUser()->getUsername().' from group '.$group->getName()); |
203 | $em->remove($this->getUser()->getUserGroupFromGroup($group)); | 205 | $em->remove($this->getUser()->getUserGroupFromGroup($group)); |
204 | 206 | ||
205 | $em->flush(); | 207 | $em->flush(); |