From 07910766b3880c43fc09c8370631b3cdc97c72c4 Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Fri, 2 Jul 2021 21:36:41 +1000
Subject: [PATCH] select2 fixes

---
 InvenTree/templates/js/forms.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/InvenTree/templates/js/forms.js b/InvenTree/templates/js/forms.js
index 6e4cf04773..6081001740 100644
--- a/InvenTree/templates/js/forms.js
+++ b/InvenTree/templates/js/forms.js
@@ -981,13 +981,13 @@ function initializeRelatedField(name, field, options) {
     var pageSize = options.pageSize || 25;
 
     select.select2({
+        placeholder: '',
+        allowClear: !field.required,
+        dropdownParent: $(options.modal),
+        dropdownAutoWidth: false,
         ajax: {
             url: field.api_url,
             dataType: 'json',
-            placeholder: '',
-            allowClear: !field.required,
-            dropdownParent: $(options.modal),
-            dropdownAutoWidth: false,
             delay: 250,
             cache: true,
             data: function(params) {
@@ -1081,6 +1081,7 @@ function initializeRelatedField(name, field, options) {
             }
 
             if (!data.pk) {
+                return field.placeholder || '';
                 return $(searching());
             }
 
@@ -1171,7 +1172,7 @@ function searching() {
 function renderModelData(name, model, data, parameters, options) {
 
     if (!data) {
-        return '{% trans "Searching" %}...';
+        return parameters.placeholder || '';
     }
 
     // TODO: Implement this function for various models