From e6408a4dff5b95e9c9fee3336c82a21120c1eb2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20B=C3=B6hmer?= <mail@jan-boehmer.de>
Date: Sat, 13 Aug 2022 23:07:05 +0200
Subject: [PATCH] Pass the full request URI (including GET params) to the
 datatables controller

Search options are passed as GET params and were therefore ignored before. This fixes issue #165.
---
 templates/_navbar_search.html.twig              | 2 +-
 templates/components/datatables.macro.html.twig | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/_navbar_search.html.twig b/templates/_navbar_search.html.twig
index 6f6f7d64..14c092e6 100644
--- a/templates/_navbar_search.html.twig
+++ b/templates/_navbar_search.html.twig
@@ -64,6 +64,6 @@
         </div>
     </div>
 
-    <input type="search" class="form-control me-sm-2 my-2" placeholder="{% trans %}search.placeholder{% endtrans %}" name="keyword">
+    <input type="search" class="form-control me-sm-2 my-2" placeholder="{% trans %}search.placeholder{% endtrans %}" name="keyword" required>
     <button type="submit" class="form btn btn-outline-secondary my-2">{% trans %}search.submit{% endtrans %}</button>
 </form>
\ No newline at end of file
diff --git a/templates/components/datatables.macro.html.twig b/templates/components/datatables.macro.html.twig
index b63beefc..e7e1cfed 100644
--- a/templates/components/datatables.macro.html.twig
+++ b/templates/components/datatables.macro.html.twig
@@ -1,5 +1,5 @@
 {% macro datatable(datatable, controller = 'elements/datatables/datatables') %}
-    <div {{ stimulus_controller(controller) }} data-dt-settings='{{ datatable_settings(datatable)|escape('html_attr') }}' data-dt-url="{{ app.request.pathInfo }}">
+    <div {{ stimulus_controller(controller) }} data-dt-settings='{{ datatable_settings(datatable)|escape('html_attr') }}' data-dt-url="{{ app.request.requestUri }}">
         <div {{ stimulus_target(controller, 'dt') }}>
             <div class="card-body">
                 <div class="card">
@@ -19,7 +19,7 @@
 
 {% macro partsDatatableWithForm(datatable) %}
     <form method="post" action="{{ path("table_action") }}"
-            {{ stimulus_controller('elements/datatables/parts') }} data-dt-settings='{{ datatable_settings(datatable)|escape('html_attr') }}' data-dt-url="{{ app.request.pathInfo }}"
+            {{ stimulus_controller('elements/datatables/parts') }} data-dt-settings='{{ datatable_settings(datatable)|escape('html_attr') }}' data-dt-url="{{ app.request.requestUri }}"
             {{ stimulus_action('elements/datatables/parts', 'confirmDeletionAtSubmit') }}  data-delete-title="{% trans %}part_list.action.delete-title{% endtrans %}"
           data-delete-message="{% trans %}part_list.action.delete-message{% endtrans %}">
         <input type="hidden" name="_token" value="{{ csrf_token('table_action') }}">