Merge branch 'master' into develop

src/Controller/Administrative/Assignment/CreateController.php

@@ -2,6 +2,7 @@
 
 namespace App\Controller\Administrative\Assignment;
 
+use App\Controller\Traits\ReturnUrlTrait;
 use App\Entity\Assignment;
 use App\Entity\User;
 use App\Form\AssignmentType;
@@ -15,6 +16,8 @@ use Symfony\Component\Security\Http\Attribute\IsGranted;
 
 class CreateController extends AbstractController
 {
+    use ReturnUrlTrait;
+
     public function __construct(
         private readonly EntityManagerInterface $entityManager,
         private readonly LoggerInterface $logger
@@ -29,6 +32,7 @@ class CreateController extends AbstractController
         $user = $this->getUser();
         $assignment = new Assignment();
         $assignment->setOwner($user);
+        $returnUrl = $this->getReturnUrl($request, 'app_administrative_assignment_index');
 
         $form = $this->createForm(
             AssignmentType::class,
@@ -51,11 +55,12 @@ class CreateController extends AbstractController
                 'job_profile' => $assignment->getJobProfile()->getName(),
             ]);
 
-            return $this->redirectToRoute('app_administrative_assignment_index');
+            return $this->redirectToRoute($returnUrl);
         }
 
         return $this->render('administrative/assignment/create.html.twig', [
             'form' => $form->createView(),
+            'returnUrl' => $returnUrl,
         ]);
     }
 }

src/Controller/Common/AssignmentFilterController.php

@@ -2,7 +2,6 @@
 
 namespace App\Controller\Common;
 
-use App\Controller\Traits\ReturnUrlTrait;
 use App\Form\AssignmentFilterType;
 use App\Htmx\HxRedirectResponse;
 use App\Repository\AssignmentRepository;
@@ -15,8 +14,6 @@ use Symfony\Component\Security\Http\Attribute\IsGranted;
 
 class AssignmentFilterController extends AbstractController
 {
-    use ReturnUrlTrait;
-
     public function __construct(
         private readonly AssignmentFilterHandler $filterHandler,
         private readonly AssignmentRepository $assignmentRepository
@@ -41,9 +38,8 @@ class AssignmentFilterController extends AbstractController
 
         if ($form->isSubmitted() && $form->isValid()) {
             $this->filterHandler->handleRequest($form);
-            $returnUrl = $this->getReturnUrl($request, 'app_administrative_assignment_index');
 
-            return new HxRedirectResponse($returnUrl);
+            return new HxRedirectResponse($this->generateUrl('app_administrative_assignment_index'));
         }
 
         return $this->render('common/modal_assignment_filter.html.twig', [
@@ -56,8 +52,7 @@ class AssignmentFilterController extends AbstractController
     public function reset(Request $request): Response
     {
         $this->filterHandler->resetFilterSettings();
-        $returnUrl = $this->getReturnUrl($request, 'app_administrative_assignment_index');
 
-        return $this->redirect($returnUrl);
+        return $this->redirectToRoute('app_administrative_assignment_index');
     }
 }