groove/Part-DB-server
1
0
Fork 0
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2026-01-08 11:19:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Include the query part of the request, when generating the url for the datatables via a custom twig function.

Browse source 
This fixes issue #735, as without this the query gets not passed to the datatable
This commit is contained in:
Jan Böhmer 2024-10-16 23:57:02 +02:00
parent 15ad0ec9c0
commit 7d834ac8d7
11 changed files with 29 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
templates/parts/info/_merge_modal.html.twig
View file

@ -17,7 +17,7 @@
<div class="modal-body">
{# non visible form elements #}
<input type="hidden" name="lot_id" value="">
<input type="hidden" name="_redirect" value="{{ app.request.baseUrl ~ app.request.pathInfo }}">
<input type="hidden" name="_redirect" value="{{ uri_without_host(app.request) }}">
<div class="row mb-2">
<label class="form-label">

2
templates/parts/info/_projects.html.twig
View file

@ -29,7 +29,7 @@
</table>
<a class="btn btn-success" {% if not is_granted('@projects.edit') %}disabled{% endif %}
href="{{ path('project_add_parts_no_id', {"parts": part.id, "_redirect": app.request.baseUrl ~ app.request.pathInfo}) }}">
href="{{ path('project_add_parts_no_id', {"parts": part.id, "_redirect": uri_without_host(app.request)}) }}">
<i class="fa-solid fa-magnifying-glass-plus fa-fw"></i>
{% trans %}part.info.add_part_to_project{% endtrans %}
</a>

2
templates/parts/info/_tools.html.twig
View file

@ -69,7 +69,7 @@
{{ dropdown.profile_dropdown('part', part.id) }}
<a class="btn btn-success mt-2" {% if not is_granted('@projects.edit') %}disabled{% endif %}
href="{{ path('project_add_parts_no_id', {"parts": part.id, "_redirect": app.request.baseUrl ~ app.request.pathInfo}) }}">
href="{{ path('project_add_parts_no_id', {"parts": part.id, "_redirect": uri_without_host(app.request)}) }}">
<i class="fa-solid fa-magnifying-glass-plus fa-fw"></i>
{% trans %}part.info.add_part_to_project{% endtrans %}
</a>

2
templates/parts/info/_withdraw_modal.html.twig
View file

@ -15,7 +15,7 @@
<input type="hidden" name="lot_id" value="">
<input type="hidden" name="action" value="">
<input type="hidden" name="_csfr" value="{{ csrf_token('part_withraw' ~ part.iD) }}">
<input type="hidden" name="_redirect" value="{{ app.request.baseUrl ~ app.request.pathInfo }}">
<input type="hidden" name="_redirect" value="{{ uri_without_host(app.request) }}">
<div class="row mb-2">
<label class="col-form-label col-sm-3">