diff --git a/assets/js/parts/globalActions.js b/assets/js/parts/globalActions.js index 9bca4e8f..e4338c3c 100644 --- a/assets/js/parts/globalActions.js +++ b/assets/js/parts/globalActions.js @@ -14,7 +14,7 @@ $(document).ready(function () { ' dessin A4 crayon;20€\n' + ' dessin A4 aquarelle;150€'; - $('[data-toggle="popover"]').popover(); + // $('[data-toggle="popover"]').popover(); $('#menu_button').on('click', function () { $('#menu-dashboard').toggleClass('shown'); }); diff --git a/src/Controller/DefaultController.php b/src/Controller/DefaultController.php index 29bc4c36..93fe3f52 100644 --- a/src/Controller/DefaultController.php +++ b/src/Controller/DefaultController.php @@ -110,10 +110,21 @@ final class DefaultController extends AbstractController $products = $this->getUser()->get_my_products(); return $this->json([ - 'products' => $products, - 'user' => $this->getUser(), + 'products' => $this->getUser()->getProducts(), ]); } + #[Route('/logged/import', name: 'import')] + public function import(): Response + { + // prendre en compte l'ajout de nouveaux produits si on a une valeur dans le POST + return $this->render('logged/import.html.twig', []); + } + #[Route('/logged/mass_create', name: 'mass_create')] + public function mass_create(): Response + { + // prendre en compte l'ajout de nouveaux produits si on a une valeur dans le POST + return $this->render('logged/import.html.twig', []); + } } diff --git a/templates/default/login-choices.html.twig b/templates/default/login-choices.html.twig index 83941cf3..2f962c70 100755 --- a/templates/default/login-choices.html.twig +++ b/templates/default/login-choices.html.twig @@ -4,6 +4,7 @@
{% if is_granted("IS_AUTHENTICATED_REMEMBERED") %} +{# panel latéral détaillant les liens#}