Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037

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 {

InvenTree/InvenTree/static/script/inventree/inventree.js

@@ -131,13 +131,21 @@ function inventreeDocReady() {
     if ($('#search-bar').exists()) {
         $('#search-bar').autocomplete({
             source: function(request, response) {
-                $.ajax({
+
-                    url: '/api/part/',
+                var params = {
-                    data: {
                     search: request.term,
                     limit: user_settings.SEARCH_PREVIEW_RESULTS,
-                        offset: 0
+                    offset: 0,
-                    },
+                };
+
+                if (user_settings.SEARCH_HIDE_INACTIVE_PARTS) {
+                    // Limit to active parts
+                    params.active = true;
+                }
+
+                $.ajax({
+                    url: '/api/part/',
+                    data: params,
                     success: function(data) {
 
                         var transformed = $.map(data.results, function(el) {

InvenTree/common/models.py

@@ -1059,6 +1059,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'),

InvenTree/templates/InvenTree/settings/user_search.html

@@ -16,6 +16,7 @@
         <tbody>
             {% 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' %}
         </tbody>
     </table>
 </div>