From b42726ff2d73b6f38a921e4a5967bf7f2d4c95ad Mon Sep 17 00:00:00 2001
From: poka <poka@p2p.legal>
Date: Thu, 21 Nov 2019 14:16:02 +0100
Subject: [PATCH] Fix produits and recherches routes

---
 src/Product/ProductModule.php                 | 4 ++--
 src/Product/views/admin/products/index.twig   | 4 ++--
 src/Product/views/admin/recherches/index.twig | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Product/ProductModule.php b/src/Product/ProductModule.php
index 010edab..93b5275 100644
--- a/src/Product/ProductModule.php
+++ b/src/Product/ProductModule.php
@@ -20,8 +20,8 @@ class ProductModule extends Module
 
         $container->get(RendererInterface::class)->addPath('product', __DIR__ . '/views');
         $router = $container->get(Router::class);
-        $router->get("$gmarchePrefix/{region:[a-z\-0-9]+}/{slug:[a-z\-0-9]+}/produits", ProductIndexAction::class, 'product.ville');
-        $router->get("$gmarchePrefix/{region:[a-z\-0-9]+}/{slug:[a-z\-0-9]+}/recherches", RechIndexAction::class, 'product.recherches');
+        $router->get("$gmarchePrefix{region:[a-z\-0-9]+}/{slug:[a-z\-0-9]+}/produits", ProductIndexAction::class, 'product.ville');
+        $router->get("$gmarchePrefix{region:[a-z\-0-9]+}/{slug:[a-z\-0-9]+}/recherches", RechIndexAction::class, 'product.recherches');
 
          //  $router->crud("$gmarchePrefix/{region:[a-z\-]+}/{slug:[a-z\-0-9]+}/{antenne:[0-9]{1,}}",[LoggedInMiddleware::class, ProductCrudAction::class],'product.admin');
     }
diff --git a/src/Product/views/admin/products/index.twig b/src/Product/views/admin/products/index.twig
index fb258fc..cf4e4d9 100644
--- a/src/Product/views/admin/products/index.twig
+++ b/src/Product/views/admin/products/index.twig
@@ -93,7 +93,7 @@
             <nav aria-label="breadcrumb">
                 <ol class="breadcrumb">
                     <li class="breadcrumb-item"><a href="{{ gmarchePrefix }}">France</a></li>
-                    <li class="breadcrumb-item"><a href="{{ gmarchePrefix }}/{{ region_slug }}">{{ region_name }}</a></li>
+                    <li class="breadcrumb-item"><a href="{{ gmarchePrefix }}{{ region_slug }}">{{ region_name }}</a></li>
                     <li class="breadcrumb-item active">G-Marché de {{ antenne_name }}</li>
 
                         <div class="toggle_radio">
@@ -102,7 +102,7 @@
                             <label for="first_toggle"><p>PRODUITS</p></label>
                             <label for="second_toggle">
                                 <p>
-                                    <a style="color:black;" href="{{ gmarchePrefix }}/{{ region_slug }}/{{ antenne_slug }}/recherches">RECHERCHES</a>
+                                    <a style="color:black;" href="{{ gmarchePrefix }}{{ region_slug }}/{{ antenne_slug }}/recherches">RECHERCHES</a>
                                 </p>
                             </label>
                             <div class="toggle_option_slider">
diff --git a/src/Product/views/admin/recherches/index.twig b/src/Product/views/admin/recherches/index.twig
index 953b22c..0092176 100644
--- a/src/Product/views/admin/recherches/index.twig
+++ b/src/Product/views/admin/recherches/index.twig
@@ -93,14 +93,14 @@
             <nav aria-label="breadcrumb">
                 <ol class="breadcrumb">
                     <li class="breadcrumb-item"><a href="{{ gmarchePrefix }}">France</a></li>
-                    <li class="breadcrumb-item"><a href="{{ gmarchePrefix }}/{{ region_slug }}">{{ region_name }}</a></li>
+                    <li class="breadcrumb-item"><a href="{{ gmarchePrefix }}{{ region_slug }}">{{ region_name }}</a></li>
                     <li class="breadcrumb-item active">G-Marché de {{ antenne_name }}</li>
 
                         <div class="toggle_radio">
                             <input type="radio" class="toggle_option" id="first_toggle" name="toggle_option">
                             <input style="color:black;" type="radio" checked class="toggle_option" id="second_toggle" name="toggle_option">
                             <label for="first_toggle">
-                                <a style="color:black;" href="{{ gmarchePrefix }}/{{ region_slug }}/{{ antenne_slug }}/produits">PRODUITS</a>
+                                <a style="color:black;" href="{{ gmarchePrefix }}{{ region_slug }}/{{ antenne_slug }}/produits">PRODUITS</a>
                             </label>
                             <label for="second_toggle">
                                 <p>RECHERCHES</p>