Update AdminRouterSubscriber.php

damien-louis · javiereguiluz · commit 03d51dd72f6e · 2025-01-13T19:29:41.000+01:00
diff --git a/src/EventListener/AdminRouterSubscriber.php b/src/EventListener/AdminRouterSubscriber.php
@@ -172,11 +172,13 @@ public function onKernelRequest(RequestEvent $event): void
             }
 
             $prettyUrlRoute = $this->adminRouteGenerator->findRouteName($dashboardControllerFqcn, $crudControllerFqcn, $request->query->get(EA::CRUD_ACTION, ''));
-            $request->query->remove(EA::CRUD_CONTROLLER_FQCN);
+            if (null !== $prettyUrlRoute) {
+                $request->query->remove(EA::CRUD_CONTROLLER_FQCN);
 
-            $event->setResponse(new RedirectResponse($this->urlGenerator->generate($prettyUrlRoute, $request->query->all())));
+                $event->setResponse(new RedirectResponse($this->urlGenerator->generate($prettyUrlRoute, $request->query->all())));
 
-            return;
+                return;
+            }
         }
 
         if (null === $dashboardControllerInstance = $this->getDashboardControllerInstance($dashboardControllerFqcn, $request)) {

Original file line number	Diff line number	Diff line change
`@@ -172,11 +172,13 @@ public function onKernelRequest(RequestEvent $event): void`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`$prettyUrlRoute = $this->adminRouteGenerator->findRouteName($dashboardControllerFqcn, $crudControllerFqcn, $request->query->get(EA::CRUD_ACTION, ''));`
`175`		`- $request->query->remove(EA::CRUD_CONTROLLER_FQCN);`
	`175`	`+ if (null !== $prettyUrlRoute) {`
	`176`	`+ $request->query->remove(EA::CRUD_CONTROLLER_FQCN);`
`176`	`177`
`177`		`- $event->setResponse(new RedirectResponse($this->urlGenerator->generate($prettyUrlRoute, $request->query->all())));`
	`178`	`+ $event->setResponse(new RedirectResponse($this->urlGenerator->generate($prettyUrlRoute, $request->query->all())));`
`178`	`179`
`179`		`- return;`
	`180`	`+ return;`
	`181`	`+ }`
`180`	`182`	`}`
`181`	`183`
`182`	`184`	`if (null === $dashboardControllerInstance = $this->getDashboardControllerInstance($dashboardControllerFqcn, $request)) {`