mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-06-20 17:15:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use form for search submit.

Browse source
This commit is contained in:
Jan Böhmer 2020-01-04 22:37:30 +01:00 • committed by Jan Böhmer
parent da88c23268
commit e293a7b5ab
7 changed files with 80 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Controller/PartListsController.php
View file

@ -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,
]);
}

65
templates/_navbar.html.twig
View file

@ -18,70 +18,7 @@
<div class="collapse navbar-collapse" id="navbarContent">
<div class="form-inline my-2 my-lg-0 ml-auto" id="searchbar">
<!-- Searchbar -->
<form action="" method="get">
<div class="dropdown d-inline">
<button class="btn btn-light dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
{% trans %}search.options.label{% endtrans %}
<span class="caret"></span>
</button>
<div class="dropdown-menu p-2" aria-labelledby="SearchOptions">
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="search_name" name="search_name" value="true" checked>
<label for="search_name" class="custom-control-label">{% trans %}name.label{% endtrans %}</label>
</div>
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="search_category" name="search_category" value="true" checked>
<label for="search_category" class="custom-control-label">{% trans %}category.label{% endtrans %}</label>
</div>
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="search_description" name="search_description" value="true" checked>
<label for="search_description" class="custom-control-label"></label>{% trans %}description.label{% endtrans %}
</div>
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="search_storelocation" name="search_storelocation" value="true" checked>
<label for="search_storelocation" class="custom-control-label">{% trans %}storelocation.label{% endtrans %}</label>
</div>
<div class=" custom-control custom-checkbox">
<input type="checkbox" id="search_comment" class="custom-control-input" id="search_comment" name="search_comment" value="true" checked>
<label for="search_comment" class="custom-control-label">{% trans %}comment.label{% endtrans %}</label>
</div>
{% if true %}
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="search_supplierpartnr" name="search_supplierpartnr" value="true" checked>
<label for="search_supplierpartnr" class="custom-control-label">{% trans %}ordernumber.label.short{% endtrans %}</label>
</div>
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="search_supplier" name="search_supplier" value="true">
<label for="search_supplier" class="custom-control-label">{% trans %}supplier.label{% endtrans %}</label>
</div>
{% endif %}
{% if true %}
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="search_manufacturer" name="search_manufacturer" value="true">
<label for="search_manufacturer" class="custom-control-label">{% trans %}manufacturer.label{% endtrans %}</label>
</div>
{% endif %}
{% if true %}
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="search_footprint" name="search_footprint" value="true">
<label for="search_footprint" class="custom-control-label">{% trans %}footprint.label{% endtrans %}</label>
</div>
{% endif %}
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="disable_pid_input" name="disable_pid_input" value="false">
<label for="disable_pid_input" class="custom-control-label">{% trans %}search.deactivateBarcode{% endtrans %}</label>
</div>
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="regex" name="regex" value="true">
<label for="regex" class="custom-control-label">{% trans %}search.regexmatching{% endtrans %}</label>
</div>
</div>
</div>
<input type="search" class="form-control mr-sm-2" placeholder="{% trans %}search.placeholder{% endtrans %}" name="keyword"
onkeyup="$('#search-submit').attr('href', $('#search-submit').data('href') + '/' + $(this).val());">
<a id="search-submit" href="#" role="button" data-href="{{ url('parts_search', {'keyword': ''}) }}" class="btn btn-outline-secondary my-2">{% trans %}go.exclamation{% endtrans %}</a>
</form>
{% include "_navbar_search.html.twig" %}
</div>
<a class="d-block d-md-none nav-link link-datasheet" style="color: black;"

63
templates/_navbar_search.html.twig Normal file
View file

@ -0,0 +1,63 @@
<form action="{{ url('parts_search') }}" method="get">
<div class="dropdown d-inline">
<button class="btn btn-light dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
{% trans %}search.options.label{% endtrans %}
<span class="caret"></span>
</button>
<div class="dropdown-menu p-2" aria-labelledby="SearchOptions">
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="search_name" name="search_name" value="true" checked>
<label for="search_name" class="custom-control-label">{% trans %}name.label{% endtrans %}</label>
</div>
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="search_category" name="search_category" value="true" checked>
<label for="search_category" class="custom-control-label">{% trans %}category.label{% endtrans %}</label>
</div>
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="search_description" name="search_description" value="true" checked>
<label for="search_description" class="custom-control-label"></label>{% trans %}description.label{% endtrans %}
</div>
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="search_storelocation" name="search_storelocation" value="true" checked>
<label for="search_storelocation" class="custom-control-label">{% trans %}storelocation.label{% endtrans %}</label>
</div>
<div class=" custom-control custom-checkbox">
<input type="checkbox" id="search_comment" class="custom-control-input" id="search_comment" name="search_comment" value="true" checked>
<label for="search_comment" class="custom-control-label">{% trans %}comment.label{% endtrans %}</label>
</div>
{% if true %}
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="search_supplierpartnr" name="search_supplierpartnr" value="true" checked>
<label for="search_supplierpartnr" class="custom-control-label">{% trans %}ordernumber.label.short{% endtrans %}</label>
</div>
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="search_supplier" name="search_supplier" value="true">
<label for="search_supplier" class="custom-control-label">{% trans %}supplier.label{% endtrans %}</label>
</div>
{% endif %}
{% if true %}
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="search_manufacturer" name="search_manufacturer" value="true">
<label for="search_manufacturer" class="custom-control-label">{% trans %}manufacturer.label{% endtrans %}</label>
</div>
{% endif %}
{% if true %}
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="search_footprint" name="search_footprint" value="true">
<label for="search_footprint" class="custom-control-label">{% trans %}footprint.label{% endtrans %}</label>
</div>
{% endif %}
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="disable_pid_input" name="disable_pid_input" value="false">
<label for="disable_pid_input" class="custom-control-label">{% trans %}search.deactivateBarcode{% endtrans %}</label>
</div>
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="regex" name="regex" value="true">
<label for="regex" class="custom-control-label">{% trans %}search.regexmatching{% endtrans %}</label>
</div>
</div>
</div>
<input type="search" class="form-control mr-sm-2" placeholder="{% trans %}search.placeholder{% endtrans %}" name="keyword">
<button type="submit" class="form btn btn-outline-secondary my-2">{% trans %}search.submit{% endtrans %}</button>
</form>

3
translations/SchebTwoFactorBundle+intl-icu.de.xlf
View file

@ -2,9 +2,6 @@
<xliff xmlns="urn:oasis:names:tc:xliff:document:2.0" version="2.0" srcLang="en" trgLang="de">
<file id="SchebTwoFactorBundle.de">
<unit id="QoghNQ6" name="login">
<notes>
<note category="file-source" priority="1">Part-DB1\templates\security\2fa_base_form.html.twig:52</note>
</notes>
<segment>
<source>login</source>
<target>Login</target>

3
translations/SchebTwoFactorBundle+intl-icu.en.xlf
View file

@ -2,9 +2,6 @@
<xliff xmlns="urn:oasis:names:tc:xliff:document:2.0" version="2.0" srcLang="en" trgLang="en">
<file id="SchebTwoFactorBundle.en">
<unit id="QoghNQ6" name="login">
<notes>
<note category="file-source" priority="1">Part-DB1\templates\security\2fa_base_form.html.twig:52</note>
</notes>
<segment>
<source>login</source>
<target>Login</target>

6
translations/messages.de.xlf
View file

@ -6275,5 +6275,11 @@ Element 3</target>
<target>Sicherheitsschlüssel</target>
</segment>
</unit>
<unit id="N66qZeD" name="search.submit">
<segment>
<source>search.submit</source>
<target>Los!</target>
</segment>
</unit>
</file>
</xliff>

6
translations/messages.en.xlf
View file

@ -6253,5 +6253,11 @@ Element 3</target>
<target>Login successful</target>
</segment>
</unit>
<unit id="N66qZeD" name="search.submit">
<segment>
<source>search.submit</source>
<target>Go!</target>
</segment>
</unit>
</file>
</xliff>