From 83e0986c9a7153697ace636f2f173cce93e385b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= Date: Wed, 19 Jun 2024 09:05:16 +0200 Subject: [PATCH] feat: keep pagination parameters when returning to previous page --- .../Administrative/Assignment/EditController.php | 8 +++++++- .../Administrative/Teamer/ProfileController.php | 9 ++++++++- src/Controller/Teamer/Application/IndexController.php | 2 +- src/Controller/Teamer/Assignment/IndexController.php | 2 +- src/Controller/Teamer/Bookmark/IndexController.php | 2 +- src/Controller/Teamer/Disposition/RecentController.php | 2 +- src/Controller/Teamer/Disposition/UpcomingController.php | 2 +- src/Menu/AdminMenuBuilder.php | 2 +- src/Menu/ManagerMenuBuilder.php | 2 +- templates/administrative/assignment/_form.html.twig | 2 +- templates/administrative/teamer/index.html.twig | 6 +++--- templates/administrative/teamer/profile.html.twig | 5 +++-- 12 files changed, 29 insertions(+), 15 deletions(-) diff --git a/src/Controller/Administrative/Assignment/EditController.php b/src/Controller/Administrative/Assignment/EditController.php index 3fe192f..156bad4 100644 --- a/src/Controller/Administrative/Assignment/EditController.php +++ b/src/Controller/Administrative/Assignment/EditController.php @@ -2,6 +2,7 @@ namespace App\Controller\Administrative\Assignment; +use App\Controller\Traits\ReturnUrlTrait; use App\Entity\Assignment; use App\Form\AssignmentType; use Doctrine\ORM\EntityManagerInterface; @@ -14,6 +15,8 @@ use Symfony\Component\Security\Http\Attribute\IsGranted; class EditController extends AbstractController { + use ReturnUrlTrait; + public function __construct( private readonly EntityManagerInterface $entityManager, private readonly LoggerInterface $logger @@ -24,6 +27,8 @@ class EditController extends AbstractController #[IsGranted('EDIT', subject: 'assignment')] public function index(Assignment $assignment, Request $request): Response { + $returnUrl = $this->getReturnUrl($request, 'app_administrative_assignment_index'); + $form = $this->createForm( AssignmentType::class, $assignment, @@ -44,11 +49,12 @@ class EditController extends AbstractController 'job_profile' => $assignment->getJobProfile()->getName(), ]); - return $this->redirectToRoute('app_administrative_assignment_index'); + return $this->redirect($returnUrl); } return $this->render('administrative/assignment/edit.html.twig', [ 'form' => $form->createView(), + 'returnUrl' => $returnUrl, ]); } } \ No newline at end of file diff --git a/src/Controller/Administrative/Teamer/ProfileController.php b/src/Controller/Administrative/Teamer/ProfileController.php index 94b4951..ee9305e 100644 --- a/src/Controller/Administrative/Teamer/ProfileController.php +++ b/src/Controller/Administrative/Teamer/ProfileController.php @@ -2,20 +2,27 @@ namespace App\Controller\Administrative\Teamer; +use App\Controller\Traits\ReturnUrlTrait; use App\Entity\Teamer; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Attribute\Route; use Symfony\Component\Security\Http\Attribute\IsGranted; class ProfileController extends AbstractController { + use ReturnUrlTrait; + #[Route('/administrative/teamer/profile/{uuid}', name: 'app_administrative_teamer_profile')] #[IsGranted('ROLE_ADMINISTRATIVE')] - public function index(Teamer $teamer): Response + public function index(Teamer $teamer, Request $request): Response { + $returnUrl = $this->getReturnUrl($request, 'app_administrative_teamer_index'); + return $this->render('administrative/teamer/profile.html.twig', [ 'teamer' => $teamer, + 'returnUrl' => $returnUrl, ]); } } \ No newline at end of file diff --git a/src/Controller/Teamer/Application/IndexController.php b/src/Controller/Teamer/Application/IndexController.php index 0f305d7..82eb973 100644 --- a/src/Controller/Teamer/Application/IndexController.php +++ b/src/Controller/Teamer/Application/IndexController.php @@ -35,7 +35,7 @@ class IndexController extends AbstractController $pagination = $this->paginator->paginate( $query, $request->query->getInt('page', 1), - 10, + 9, [ 'defaultSortFieldName' => 'assignment.dateFrom', 'defaultSortDirection' => 'asc', diff --git a/src/Controller/Teamer/Assignment/IndexController.php b/src/Controller/Teamer/Assignment/IndexController.php index 59307ac..773adbd 100644 --- a/src/Controller/Teamer/Assignment/IndexController.php +++ b/src/Controller/Teamer/Assignment/IndexController.php @@ -44,7 +44,7 @@ class IndexController extends AbstractController $pagination = $this->paginator->paginate( $query, $request->query->getInt('page', 1), - 10, + 9, [ 'defaultSortFieldName' => 'destination.dateFrom', 'defaultSortDirection' => 'asc', diff --git a/src/Controller/Teamer/Bookmark/IndexController.php b/src/Controller/Teamer/Bookmark/IndexController.php index 136ec0d..a92ad20 100644 --- a/src/Controller/Teamer/Bookmark/IndexController.php +++ b/src/Controller/Teamer/Bookmark/IndexController.php @@ -35,7 +35,7 @@ class IndexController extends AbstractController $pagination = $this->paginator->paginate( $query, $request->query->getInt('page', 1), - 10, + 9, [ 'defaultSortFieldName' => 'assignment.dateFrom', 'defaultSortDirection' => 'asc', diff --git a/src/Controller/Teamer/Disposition/RecentController.php b/src/Controller/Teamer/Disposition/RecentController.php index c65caed..0aed344 100644 --- a/src/Controller/Teamer/Disposition/RecentController.php +++ b/src/Controller/Teamer/Disposition/RecentController.php @@ -35,7 +35,7 @@ class RecentController extends AbstractController $pagination = $this->paginator->paginate( $query, $request->query->getInt('page', 1), - 10, + 9, [ 'defaultSortFieldName' => 'assignment.dateFrom', 'defaultSortDirection' => 'asc', diff --git a/src/Controller/Teamer/Disposition/UpcomingController.php b/src/Controller/Teamer/Disposition/UpcomingController.php index 3269d14..9c3150d 100644 --- a/src/Controller/Teamer/Disposition/UpcomingController.php +++ b/src/Controller/Teamer/Disposition/UpcomingController.php @@ -35,7 +35,7 @@ class UpcomingController extends AbstractController $pagination = $this->paginator->paginate( $query, $request->query->getInt('page', 1), - 10, + 9, [ 'defaultSortFieldName' => 'assignment.dateFrom', 'defaultSortDirection' => 'asc', diff --git a/src/Menu/AdminMenuBuilder.php b/src/Menu/AdminMenuBuilder.php index 94b958c..614a6ed 100644 --- a/src/Menu/AdminMenuBuilder.php +++ b/src/Menu/AdminMenuBuilder.php @@ -249,7 +249,7 @@ class AdminMenuBuilder extends AbstractMenuBuilder $this->addDivider($menu); $menu->addChild('zurück zur Übersicht', [ - 'route' => 'app_administrative_teamer_index', + 'uri' => $options['return_url'], 'extras' => [ 'icon' => 'arrow-left', ], diff --git a/src/Menu/ManagerMenuBuilder.php b/src/Menu/ManagerMenuBuilder.php index b689d2b..3f4cd59 100644 --- a/src/Menu/ManagerMenuBuilder.php +++ b/src/Menu/ManagerMenuBuilder.php @@ -136,7 +136,7 @@ class ManagerMenuBuilder extends AbstractMenuBuilder $this->addDivider($menu); $menu->addChild('zurück zur Übersicht', [ - 'route' => 'app_administrative_teamer_index', + 'uri' => $options['return_url'], 'extras' => [ 'icon' => 'arrow-left', ], diff --git a/templates/administrative/assignment/_form.html.twig b/templates/administrative/assignment/_form.html.twig index 431b4a6..c0a695e 100644 --- a/templates/administrative/assignment/_form.html.twig +++ b/templates/administrative/assignment/_form.html.twig @@ -41,7 +41,7 @@ - + Abbrechen diff --git a/templates/administrative/teamer/index.html.twig b/templates/administrative/teamer/index.html.twig index 1773c60..d7caabc 100644 --- a/templates/administrative/teamer/index.html.twig +++ b/templates/administrative/teamer/index.html.twig @@ -70,12 +70,12 @@ - + {{ teamer.lastName }} - + {{ teamer.firstName }} @@ -99,7 +99,7 @@ {{ icon('mask') }} {% endif %} - + {{ icon('user') }} diff --git a/templates/administrative/teamer/profile.html.twig b/templates/administrative/teamer/profile.html.twig index 15c912a..d670d76 100644 --- a/templates/administrative/teamer/profile.html.twig +++ b/templates/administrative/teamer/profile.html.twig @@ -6,10 +6,11 @@
{% if is_granted('ROLE_MANAGER') %} - {{ knp_menu_render(knp_menu_get('manager_teamer')) }} + {{ knp_menu_render(knp_menu_get('manager_teamer', [], { 'return_url': returnUrl })) }} {% elseif is_granted('ROLE_ADMIN') %} - {{ knp_menu_render(knp_menu_get('admin_teamer')) }} + {{ knp_menu_render(knp_menu_get('admin_teamer', [], { 'return_url': returnUrl })) }} {% endif %} +