From 71bb6fff5005b09628adcd14a842e20f0093fa29 Mon Sep 17 00:00:00 2001 From: Oliver Date: Thu, 4 Nov 2021 22:25:35 +1100 Subject: [PATCH] Add option to hide inactive parts in search preview window --- InvenTree/InvenTree/static/css/inventree.css | 1 + .../static/script/inventree/inventree.js | 18 +++++++++++++----- InvenTree/common/models.py | 7 +++++++ .../InvenTree/settings/user_search.html | 1 + 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css index 478734383f..b2e3b36354 100644 --- a/InvenTree/InvenTree/static/css/inventree.css +++ b/InvenTree/InvenTree/static/css/inventree.css @@ -563,6 +563,7 @@ .search-autocomplete-item { border-top: 1px solid #EEE; margin-bottom: 2px; + overflow-x: hidden; } .modal { diff --git a/InvenTree/InvenTree/static/script/inventree/inventree.js b/InvenTree/InvenTree/static/script/inventree/inventree.js index df48cf7d60..85ae042728 100644 --- a/InvenTree/InvenTree/static/script/inventree/inventree.js +++ b/InvenTree/InvenTree/static/script/inventree/inventree.js @@ -131,13 +131,21 @@ function inventreeDocReady() { if ($('#search-bar').exists()) { $('#search-bar').autocomplete({ source: function(request, response) { + + var params = { + search: request.term, + limit: user_settings.SEARCH_PREVIEW_RESULTS, + offset: 0, + }; + + if (user_settings.SEARCH_HIDE_INACTIVE_PARTS) { + // Limit to active parts + params.active = true; + } + $.ajax({ url: '/api/part/', - data: { - search: request.term, - limit: user_settings.SEARCH_PREVIEW_RESULTS, - offset: 0 - }, + data: params, success: function(data) { var transformed = $.map(data.results, function(el) { diff --git a/InvenTree/common/models.py b/InvenTree/common/models.py index bc1463ca00..53924f11fa 100644 --- a/InvenTree/common/models.py +++ b/InvenTree/common/models.py @@ -1012,6 +1012,13 @@ class InvenTreeUserSetting(BaseInvenTreeSetting): 'validator': bool, }, + 'SEARCH_HIDE_INACTIVE_PARTS': { + 'name': _("Hide Inactive Parts"), + 'description': _('Hide inactive parts in search preview window'), + 'default': False, + 'validator': bool, + }, + 'PART_SHOW_QUANTITY_IN_FORMS': { 'name': _('Show Quantity in Forms'), 'description': _('Display available part quantity in some forms'), diff --git a/InvenTree/templates/InvenTree/settings/user_search.html b/InvenTree/templates/InvenTree/settings/user_search.html index 43eab057c3..51df53ee6b 100644 --- a/InvenTree/templates/InvenTree/settings/user_search.html +++ b/InvenTree/templates/InvenTree/settings/user_search.html @@ -16,6 +16,7 @@ {% include "InvenTree/settings/setting.html" with key="SEARCH_PREVIEW_RESULTS" user_setting=True icon='fa-search' %} {% include "InvenTree/settings/setting.html" with key="SEARCH_SHOW_STOCK_LEVELS" user_setting=True icon='fa-boxes' %} + {% include "InvenTree/settings/setting.html" with key="SEARCH_HIDE_INACTIVE_PARTS" user_setting=True icon='fa-eye-slash' %}