fix: properly forward return urls where missing

src/Controller/Administrative/Assignment/DuplicateController.php

@@ -55,6 +55,7 @@ class DuplicateController extends AbstractController
 
             return $this->redirectToRoute('app_administrative_assignment_edit', [
                 'uuid' => $copy->getUuid(),
+                'r' => $request->query->get('r'),
             ]);
         }
 

src/Controller/Administrative/Disposition/BusProNetSyncToggleController.php

@@ -38,6 +38,7 @@ class BusProNetSyncToggleController extends AbstractController
 
         return new HxRedirectResponse($this->generateUrl('app_administrative_assignment_detail', [
             'uuid' => $disposition->getAssignment()->getUuid(),
+            'r' => $request->query->get('r'),
         ]));
     }
 }

src/Controller/Administrative/Disposition/CallOffController.php

@@ -55,6 +55,7 @@ class CallOffController extends AbstractController
 
             return new HxRedirectResponse($this->generateUrl('app_administrative_assignment_detail', [
                 'uuid' => $assignment->getUuid(),
+                'r' => $request->query->get('r'),
             ]));
         }
 

src/Controller/Administrative/Disposition/DocumentUploadController.php

@@ -61,6 +61,7 @@ class DocumentUploadController extends AbstractController
 
             return new HxRedirectResponse($this->generateUrl('app_administrative_assignment_detail', [
                 'uuid' => $disposition->getAssignment()->getUuid(),
+                'r' => $request->query->get('r'),
             ]));
         }
 

src/Controller/Administrative/Disposition/SpecialAgreementsController.php

@@ -38,6 +38,7 @@ class SpecialAgreementsController extends AbstractController
 
             return new HxRedirectResponse($this->generateUrl('app_administrative_assignment_detail', [
                 'uuid' => $disposition->getAssignment()->getUuid(),
+                'r' => $request->query->get('r'),
             ]));
         }
 

src/Controller/Administrative/Teamer/InfoController.php

@@ -24,7 +24,13 @@ class InfoController extends AbstractController
     #[IsGranted(new Expression('is_granted("ROLE_ADMINISTRATIVE") or is_granted("ROLE_HOUSE_MANAGER")'))]
     public function index(Teamer $teamer, Request $request): Response
     {
-        $returnUrl = $this->getReturnUrl($request, 'app_administrative_assignment_index');
+        // House managers reach this modal but not the administrative overviews,
+        // so their fallback has to stay inside their own area.
+        $defaultReturnUrlRoute = $this->isGranted('ROLE_ADMINISTRATIVE')
+            ? 'app_administrative_assignment_index'
+            : 'app_house_manager_index';
+
+        $returnUrl = $this->getReturnUrl($request, $defaultReturnUrlRoute);
 
         $recentDispositions = $this->dispositionRepository->findRecentDispositionsByTeamer($teamer);