feat: keep pagination parameters when returning to previous page

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,
         ]);
     }
 }

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,
         ]);
     }
 }

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',

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',

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',

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',

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',