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/InvenTree/static/script/inventree/stock.js b/InvenTree/InvenTree/static/script/inventree/stock.js
index bf0ddbef5e..d68d0946a2 100644
--- a/InvenTree/InvenTree/static/script/inventree/stock.js
+++ b/InvenTree/InvenTree/static/script/inventree/stock.js
@@ -41,6 +41,7 @@ function loadStockTable(table, options) {
* groupByField - Column for grouping stock items
* buttons - Which buttons to link to stock selection callbacks
* filterList -
element where filters are displayed
+ * disableFilters: If true, disable custom filters
*/
// List of user-params which override the default filters
@@ -48,7 +49,11 @@ function loadStockTable(table, options) {
var filterListElement = options.filterList || "#filter-list-stock";
- var filters = loadTableFilters("stock");
+ var filters = {};
+
+ if (!options.disableFilters) {
+ filters = loadTableFilters("stock");
+ }
var original = {};
diff --git a/InvenTree/part/templates/part/category.html b/InvenTree/part/templates/part/category.html
index 63a60bd71e..9382259cce 100644
--- a/InvenTree/part/templates/part/category.html
+++ b/InvenTree/part/templates/part/category.html
@@ -137,29 +137,30 @@
$("#cat-create").click(function() {
launchModalForm(
- "{% url 'category-create' %}",
- {
- follow: true,
- {% if category %}
- data: {
- category: {{ category.id }}
- },
- {% endif %}
- secondary: [
- {
- field: 'default_location',
- label: 'New Location',
- title: 'Create new location',
- url: "{% url 'stock-location-create' %}",
- },
- {
- field: 'parent',
- label: 'New Category',
- title: 'Create new category',
- url: "{% url 'category-create' %}",
- },
- ]
- });
+ "{% url 'category-create' %}",
+ {
+ follow: true,
+ {% if category %}
+ data: {
+ category: {{ category.id }}
+ },
+ {% endif %}
+ secondary: [
+ {
+ field: 'default_location',
+ label: 'New Location',
+ title: 'Create new location',
+ url: "{% url 'stock-location-create' %}",
+ },
+ {
+ field: 'parent',
+ label: 'New Category',
+ title: 'Create new category',
+ url: "{% url 'category-create' %}",
+ },
+ ]
+ }
+ );
})
$("#part-export").click(function() {
diff --git a/InvenTree/templates/InvenTree/search.html b/InvenTree/templates/InvenTree/search.html
index e8cda96809..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,20 +125,22 @@ InvenTree | {% trans "Search Results" %}
],
});
+
loadPartTable("#part-results-table",
"{% url 'api-part-list' %}",
{
- query: {
+ params: {
search: "{{ query }}",
},
- allowInactive: true,
checkbox: false,
+ disableFilters: true,
}
);
+
loadCompanyTable('#company-results-table', "{% url 'api-company-list' %}", {
params: {
- serach: "{{ query }}",
+ search: "{{ query }}",
}
});
@@ -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 69c5c29051..ca75b096c2 100644
--- a/InvenTree/templates/InvenTree/search_parts.html
+++ b/InvenTree/templates/InvenTree/search_parts.html
@@ -9,6 +9,13 @@
{% endblock %}
{% block collapse_content %}
+
+
{% endblock %}
\ No newline at end of file