From e293a7b5abbc52f587f6cf5b672d807ebcd4fa10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20B=C3=B6hmer?= Date: Sat, 4 Jan 2020 22:37:30 +0100 Subject: [PATCH] Use form for search submit. --- src/Controller/PartListsController.php | 8 +-- templates/_navbar.html.twig | 65 +------------------ templates/_navbar_search.html.twig | 63 ++++++++++++++++++ .../SchebTwoFactorBundle+intl-icu.de.xlf | 3 - .../SchebTwoFactorBundle+intl-icu.en.xlf | 3 - translations/messages.de.xlf | 6 ++ translations/messages.en.xlf | 6 ++ 7 files changed, 80 insertions(+), 74 deletions(-) create mode 100644 templates/_navbar_search.html.twig diff --git a/src/Controller/PartListsController.php b/src/Controller/PartListsController.php index 4c364ca4..5d34ffad 100644 --- a/src/Controller/PartListsController.php +++ b/src/Controller/PartListsController.php @@ -165,11 +165,11 @@ class PartListsController extends AbstractController } /** - * @Route("/parts/search/{keyword}", name="parts_search") + * @Route("/parts/search", name="parts_search") */ - public function showSearch(Request $request, DataTableFactory $dataTable, string $keyword = '') + public function showSearch(Request $request, DataTableFactory $dataTable) { - $search = $keyword; + $search = $request->get('keyword', ''); $table = $dataTable->createFromType(PartsDataTable::class, ['search' => $search]) ->handleRequest($request); @@ -180,7 +180,7 @@ class PartListsController extends AbstractController return $this->render('Parts/lists/search_list.html.twig', [ 'datatable' => $table, - 'keyword' => $keyword, + 'keyword' => $search, ]); } diff --git a/templates/_navbar.html.twig b/templates/_navbar.html.twig index 40958da6..96f382f6 100644 --- a/templates/_navbar.html.twig +++ b/templates/_navbar.html.twig @@ -18,70 +18,7 @@