router fix

LitusProject · Oct 21, 2023 · 073999f · 073999f
1 parent 9bda3ae
commit 073999f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/module/LogisticsBundle/Controller/AuthController.php b/module/LogisticsBundle/Controller/AuthController.php
@@ -48,7 +48,10 @@ public function loginAction()
         }
 
         $this->redirect()->toRoute(
-            'logistics_catalog'
+            'logistics_catalog',
+            array(
+                'language' => $this->getLanguage()->getAbbrev(),
+            )
         );
 
         return new ViewModel();
@@ -108,7 +111,10 @@ public function shibbolethAction()
                             );
                         } else {
                             $this->redirect()->toRoute(
-                                'logistics_catalog'
+                                'logistics_catalog',
+                                array(
+                                    'language' => $this->getLanguage()->getAbbrev(),
+                                )
                             );
                         }
 

diff --git a/module/LogisticsBundle/Resources/config/router.config.php b/module/LogisticsBundle/Resources/config/router.config.php
@@ -234,7 +234,7 @@
         'logistics_catalog' => array(
             'type'    => 'Laminas\Router\Http\Segment',
             'options' => array(
-                'route'       => '[/:language]/logistics/catalog[/:action[/:order][/request/:request][/page/:page]][/]',
+                'route'       => '[/:language]/logistics[/catalog[/:action[/:order][/request/:request][/page/:page]]][/]',
                 'constraints' => array(
                     'action'   => '[a-zA-Z][a-zA-Z0-9_-]*',
                     'order'    => '[0-9]*',
@@ -291,11 +291,11 @@
         'logistics_admin_lease'             => 'LogisticsBundle\Controller\Admin\LeaseController',
         'logistics_admin_inventory'         => 'LogisticsBundle\Controller\Admin\InventoryController',
 
+        'logistics_catalog'                 => 'LogisticsBundle\Controller\CatalogController',
         'logistics_transport'               => 'LogisticsBundle\Controller\TransportController',
         'logistics_auth'                    => 'LogisticsBundle\Controller\AuthController',
         'logistics_piano'                   => 'LogisticsBundle\Controller\PianoController',
         'logistics_lease'                   => 'LogisticsBundle\Controller\LeaseController',
-        'logistics_catalog'                 => 'LogisticsBundle\Controller\CatalogController',
         'logistics_inventory'               => 'LogisticsBundle\Controller\InventoryController',
     ),
 );