fix: preserve return url in submenus

src/Menu/AbstractMenuBuilder.php

@@ -28,7 +28,12 @@ abstract class AbstractMenuBuilder
 
     protected function getDefaultRouteParameters(string $parameter = 'id', string $default = '0'): array
     {
-        return [$parameter => $this->requestStack->getMainRequest()->get($parameter, $default)];
+        $request = $this->requestStack->getMainRequest();
+
+        return [
+            $parameter => $request->get($parameter, $default),
+            'r' => $request->get('r'),
+        ];
     }
 
     protected function addAdminItem(ItemInterface $menu): void

src/Menu/AdminMenuBuilder.php

@@ -259,8 +259,10 @@ class AdminMenuBuilder extends AbstractMenuBuilder
 
         $this->addDivider($menu);
 
+        $request = $this->requestStack->getMainRequest();
+
         $menu->addChild('zurück zur Übersicht', [
-            'uri' => $options['return_url'],
+            'uri' => $request->get('r'),
             'extras' => [
                 'icon' => 'arrow-left',
             ],

src/Menu/ManagerMenuBuilder.php

@@ -146,8 +146,10 @@ class ManagerMenuBuilder extends AbstractMenuBuilder
 
         $this->addDivider($menu);
 
+        $request = $this->requestStack->getMainRequest();
+
         $menu->addChild('zurück zur Übersicht', [
-            'uri' => $options['return_url'],
+            'uri' => $request->get('r'),
             'extras' => [
                 'icon' => 'arrow-left',
             ],