fix

LitusProject · Oct 19, 2023 · dfc7238 · dfc7238
1 parent 6ea8f47
commit dfc7238
Show file tree

Hide file tree

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

diff --git a/module/LogisticsBundle/Controller/LeaseController.php b/module/LogisticsBundle/Controller/LeaseController.php
@@ -236,7 +236,7 @@ private function getPersonEntity()
                 'No person was authenticated!'
             );
 
-            $this->redirect()->toRoute('logistics_catalog');
+            $this->redirect()->toRoute('logistics_transport');
 
             return;
         }

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]*',
@@ -251,7 +251,7 @@
         'logistics_catalog_typeahead' => array(
             'type'    => 'Laminas\Router\Http\Segment',
             'options' => array(
-                'route'       => '[/:language]/logistics[/:order]/typeahead[/:string][/]',
+                'route'       => '[/:language]/logistics/catalog[/:order]/typeahead[/:string][/]',
                 'constraints' => array(
                     'order'    => '[0-9]*',
                     'language' => '(en|nl)',

diff --git a/module/LogisticsBundle/Resources/layouts/logistics/base.twig b/module/LogisticsBundle/Resources/layouts/logistics/base.twig
@@ -24,7 +24,7 @@
                     <ul class="nav navbar-nav">
                         {% if hasAccess('logistics_catalog', 'overview') %}
                             <li {% if 'logistics_catalog' == getParam('controller') %}class="active"{% endif %}>
-                                <a href="{{ url('logistics_catalog', {"language": language.getAbbrev()}) }}">{{ translate('Material') }}</a>
+                                <a href="{{ url('logistics_catalog', {"language": language.getAbbrev()}) }}">{{ translate('Requests') }}</a>
                             </li>
                         {% endif %}
                         {% if hasAccess('logistics_inventory', 'index') %}
-Original file line number
+Diff line change
@@ Expand Up / @@ -236,7 +236,7 @@ private function getPersonEntity() @@
                     'No person was authenticated!'
                 );
-                $this->redirect()->toRoute('logistics_catalog');
+                $this->redirect()->toRoute('logistics_transport');
                 return;
             }
@@ Expand Down @@