Fix and Enhancements

This commit is contained in:
Xbird
2022-04-26 19:17:57 +00:00
parent 200c6ac256
commit 72123b8782
22 changed files with 173 additions and 143 deletions

View File

@@ -70,23 +70,34 @@ class AdminController extends AbstractController
//-- users
#[Route('/user', name: 'user_list')]
#[Route('/user/admin', name: 'user_list_admin')]
#[Route('/user/desactivated', name: 'user_list_desactivated')]
public function user(PaginatorInterface $paginator, Request $request, UserRepository $UserRepository): Response
{
$searchForm = $this->createForm(SearchBarType::class);
$searchForm->handleRequest($request);
$req = $UserRepository->getAll()
->search(
(
$searchForm->isSubmitted()
&& $searchForm->isValid()
&& $searchForm->getData()['subject'] !== null
) ? $searchForm->getData()['subject'] : null,
true
);
if ($request->attributes->get('_route') == 'admin_user_list_admin') {
$req->onlyRole('ADMIN');
}
if ($request->attributes->get('_route') == 'admin_user_list_desactivated') {
$req->onlyDesactivated();
}
$pagination = $paginator->paginate(
$UserRepository->getAll()
->search(
(
$searchForm->isSubmitted()
&& $searchForm->isValid()
&& $searchForm->getData()['subject'] !== null
) ? $searchForm->getData()['subject'] : null,
true
)
->getResult(),
$req->getResult(),
$request->query->getInt('page', 1)
);
@@ -94,6 +105,8 @@ class AdminController extends AbstractController
'controller_name' => 'AdminController',
'searchForm' => $searchForm->createView(),
'pagination' => $pagination,
'admin' => ($request->attributes->get('_route') == 'admin_user_list_admin'),
'desactivated' => ($request->attributes->get('_route') == 'admin_user_list_desactivated')
]);
}