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

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

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

templates/administrative/assignment/_form.html.twig

@@ -41,7 +41,7 @@
     <button type="submit" class="btn">
         Speichern
     </button>
-    <a href="{{ path('app_administrative_assignment_index') }}" class="btn btn--secondary">
+    <a href="{{ returnUrl }}" class="btn btn--secondary">
         Abbrechen
     </a>
 </div>

templates/administrative/teamer/index.html.twig

@@ -70,12 +70,12 @@
                             </div>
                         </td>
                         <td>
-                            <a href="{{ path('app_administrative_teamer_profile', { 'uuid': teamer.uuid }) }}">
+                            <a href="{{ path('app_administrative_teamer_profile', { 'uuid': teamer.uuid, 'r': return_url() }) }}">
                                 <span class="whitespace-nowrap">{{ teamer.lastName }}</span>
                             </a>
                         </td>
                         <td>
-                            <a href="{{ path('app_administrative_teamer_profile', { 'uuid': teamer.uuid }) }}" class="whitespace-nowrap">
+                            <a href="{{ path('app_administrative_teamer_profile', { 'uuid': teamer.uuid, 'r': return_url() }) }}" class="whitespace-nowrap">
                                 {{ teamer.firstName }}
                             </a>
                         </td>
@@ -99,7 +99,7 @@
                                         {{ icon('mask') }}
                                     </a>
                                 {% endif %}
-                                <a href="{{ path('app_administrative_teamer_profile', { 'uuid': teamer.uuid }) }}" title="Teamer:innenprofil {{ teamer }}">
+                                <a href="{{ path('app_administrative_teamer_profile', { 'uuid': teamer.uuid, 'r': return_url() }) }}" title="Teamer:innenprofil {{ teamer }}">
                                     {{ icon('user') }}
                                 </a>
                             </div>

templates/administrative/teamer/profile.html.twig

@@ -6,10 +6,11 @@
     <div class="grid lg:grid-cols-3 gap-y-8 lg:gap-y-0 lg:gap-x-8">
         <div>
             {% 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 %}
+
         </div>
         <div class="lg:col-span-2">
             <h1 class="text-2xl font-bold pb-8">