From 206d67337f033be1cc5a8fcf9a2258ba805b01bd Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 16 Apr 2020 21:41:45 +1000 Subject: [PATCH] Option to disable filters for part table --- InvenTree/InvenTree/static/script/inventree/part.js | 8 ++++++-- InvenTree/templates/InvenTree/search.html | 7 +++++-- InvenTree/templates/InvenTree/search_parts.html | 1 + 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/InvenTree/InvenTree/static/script/inventree/part.js b/InvenTree/InvenTree/static/script/inventree/part.js index 05328dbbd8..7954caa012 100644 --- a/InvenTree/InvenTree/static/script/inventree/part.js +++ b/InvenTree/InvenTree/static/script/inventree/part.js @@ -81,15 +81,19 @@ function loadPartTable(table, url, options={}) { * - table: HTML reference to the table * - url: Base URL for API query * - options: object containing following (optional) fields - * allowInactive: If true, allow display of inactive parts * checkbox: Show the checkbox column * query: extra query params for API request * buttons: If provided, link buttons to selection status of this table + * disableFilters: If true, disable custom filters */ var params = options.params || {}; - var filters = loadTableFilters("parts"); + var filters = {}; + + if (!options.disableFilters) { + filters = loadTableFilters("parts"); + } for (var key in params) { filters[key] = params[key]; diff --git a/InvenTree/templates/InvenTree/search.html b/InvenTree/templates/InvenTree/search.html index 99b704c626..76fd62b697 100644 --- a/InvenTree/templates/InvenTree/search.html +++ b/InvenTree/templates/InvenTree/search.html @@ -104,6 +104,7 @@ InvenTree | {% trans "Search Results" %} ], }); + $("#location-results-table").inventreeTable({ url: "{% url 'api-location-list' %}", queryParams: { @@ -124,16 +125,18 @@ InvenTree | {% trans "Search Results" %} ], }); + loadPartTable("#part-results-table", "{% url 'api-part-list' %}", { params: { search: "{{ query }}", }, - allowInactive: true, checkbox: false, + disableFilters: true, } ); + loadCompanyTable('#company-results-table', "{% url 'api-company-list' %}", { params: { @@ -153,5 +156,5 @@ InvenTree | {% trans "Search Results" %} }, } ); - + {% endblock %} \ No newline at end of file diff --git a/InvenTree/templates/InvenTree/search_parts.html b/InvenTree/templates/InvenTree/search_parts.html index f06155354d..ca75b096c2 100644 --- a/InvenTree/templates/InvenTree/search_parts.html +++ b/InvenTree/templates/InvenTree/search_parts.html @@ -11,6 +11,7 @@ {% block collapse_content %}
+