From d335ab3a8082e32b60c26142ff3f3d56f7737e01 Mon Sep 17 00:00:00 2001
From: Matthew Smith <mattysmith22@googlemail.com>
Date: Mon, 25 Nov 2019 13:40:16 +0000
Subject: [PATCH] Fixed asset picker backend

---
 assets/templates/partials/asset_picker.html    | 2 ++
 assets/templates/partials/supplier_picker.html | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/assets/templates/partials/asset_picker.html b/assets/templates/partials/asset_picker.html
index 444d95cd..fd63fe86 100644
--- a/assets/templates/partials/asset_picker.html
+++ b/assets/templates/partials/asset_picker.html
@@ -16,6 +16,7 @@
 {% endblock %}
 
 {% block js %}
+{{ js.super }}
 <script>
 $('#parent_id')
     .selectpicker({
@@ -55,6 +56,7 @@ $('#parent_id')
                     'text': "No parent"
                 });
             }
+            
             return assets;
         },
         preserveSelected: false
diff --git a/assets/templates/partials/supplier_picker.html b/assets/templates/partials/supplier_picker.html
index e0989db6..842290b3 100644
--- a/assets/templates/partials/supplier_picker.html
+++ b/assets/templates/partials/supplier_picker.html
@@ -1,4 +1,4 @@
-<select name="parent_s" id="parent_s_id" class="selectpicker">
+<select name="purchased_from" id="supplier_id" class="selectpicker">
     {% if object.parent%}
     <option value="{{object.parent.pk}}" selected>{{object.parent.name}}</option>
     {% endif %}
@@ -16,8 +16,9 @@
 {% endblock %}
 
 {% block js %}
+{{ js.super }}
 <script>
-$('#parent_s_id')
+$('#supplier_id')
     .selectpicker({
         liveSearch: true
     })
@@ -44,7 +45,7 @@ $('#parent_s_id')
                     suppliers.push(
                         {
                             'value': curr.id,
-                            'text': curr.label,
+                            'text': curr.name,
                             'disabled': false
                         }
                     );
@@ -55,7 +56,7 @@ $('#parent_s_id')
                     'text': "(no selection)"
                 });
             }
-            return assets;
+            return suppliers;
         },
         preserveSelected: false
     });