From fc9ce9f01c05309edab536b155211e0fa4e0e74e Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Tue, 31 Dec 2019 18:50:04 +0000
Subject: [PATCH] FIX #388: Prevent assets losing supplier data on edit

---
 RIGS/views.py                                 |  3 +
 assets/forms.py                               |  5 ++
 assets/templates/asset_create.html            | 10 +++
 assets/templates/asset_update.html            | 11 ++++
 .../partials/purchasedetails_form.html        |  8 ++-
 .../templates/partials/supplier_picker.html   | 64 -------------------
 6 files changed, 35 insertions(+), 66 deletions(-)
 delete mode 100644 assets/templates/partials/supplier_picker.html

diff --git a/RIGS/views.py b/RIGS/views.py
index b197334c..023f0089 100644
--- a/RIGS/views.py
+++ b/RIGS/views.py
@@ -17,6 +17,7 @@ from django.views.decorators.csrf import csrf_exempt
 
 
 from RIGS import models, forms
+from assets import models as asset_models
 from functools import reduce
 
 """
@@ -248,6 +249,7 @@ class SecureAPIRequest(generic.View):
         'organisation': models.Organisation,
         'profile': models.Profile,
         'event': models.Event,
+        'supplier': asset_models.Supplier
     }
 
     perms = {
@@ -256,6 +258,7 @@ class SecureAPIRequest(generic.View):
         'organisation': 'RIGS.view_organisation',
         'profile': 'RIGS.view_profile',
         'event': None,
+        'supplier': None
     }
 
     '''
diff --git a/assets/forms.py b/assets/forms.py
index 7571d28b..ea05efd3 100644
--- a/assets/forms.py
+++ b/assets/forms.py
@@ -4,6 +4,11 @@ from assets import models
 
 
 class AssetForm(forms.ModelForm):
+    related_models = {
+        'asset': models.Asset,
+        'supplier': models.Supplier
+    }
+
     class Meta:
         model = models.Asset
         fields = '__all__'
diff --git a/assets/templates/asset_create.html b/assets/templates/asset_create.html
index b0bb8297..7a7683f8 100644
--- a/assets/templates/asset_create.html
+++ b/assets/templates/asset_create.html
@@ -1,8 +1,18 @@
 {% extends 'base_assets.html' %}
 {% load widget_tweaks %}
+{% load static %}
 {% load asset_templatetags %}
 {% block title %}Asset {{ object.asset_id }}{% endblock %}
 
+{% block css %}
+    <link rel="stylesheet" href="{% static "css/bootstrap-select.min.css" %}"/>
+    <link rel="stylesheet" href="{% static "css/ajax-bootstrap-select.css" %}"/>
+{% endblock %}
+
+{% block preload_js %}
+    <script src="{% static "js/bootstrap-select.js" %}"></script>
+    <script src="{% static "js/ajax-bootstrap-select.js" %}"></script>
+{% endblock %}
 
 {% block content %}
 
diff --git a/assets/templates/asset_update.html b/assets/templates/asset_update.html
index 9987e4fe..2aeb89f6 100644
--- a/assets/templates/asset_update.html
+++ b/assets/templates/asset_update.html
@@ -1,8 +1,18 @@
 {% extends 'base_assets.html' %}
 {% load widget_tweaks %}
+{% load static %}
 {% load asset_templatetags %}
 {% block title %}Asset {{ object.asset_id }}{% endblock %}
 
+{% block css %}
+    <link rel="stylesheet" href="{% static "css/bootstrap-select.min.css" %}"/>
+    <link rel="stylesheet" href="{% static "css/ajax-bootstrap-select.css" %}"/>
+{% endblock %}
+
+{% block preload_js %}
+    <script src="{% static "js/bootstrap-select.js" %}"></script>
+    <script src="{% static "js/ajax-bootstrap-select.js" %}"></script>
+{% endblock %}
 
 {% block content %}
 
@@ -69,5 +79,6 @@
   }
   checkIfCableHidden();
 </script>
+<script src="{% static "js/autocompleter.js" %}"></script>
 {% endif %}
 {% endblock %}
diff --git a/assets/templates/partials/purchasedetails_form.html b/assets/templates/partials/purchasedetails_form.html
index d5979439..30bdd9d2 100644
--- a/assets/templates/partials/purchasedetails_form.html
+++ b/assets/templates/partials/purchasedetails_form.html
@@ -7,8 +7,12 @@
   <div class="panel-body">
     {% if create or edit or duplicate %}
     <div class="form-group">
-      <label for="{{ form.purchased_from.id_for_label }}">Purchased From</label>
-      {% include 'partials/supplier_picker.html' %}
+      <label for="{{ form.purchased_from.id_for_label }}">Supplier</label>
+      <select id="{{ form.purchased_from.id_for_label }}" name="{{ form.purchased_from.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='supplier' %}">
+        {% if object.purchased_from %}
+            <option value="{{form.purchased_from.value}}" selected="selected" data-update_url="{% url 'supplier_update' form.purchased_from.value %}">{{ object.purchased_from }}</option>
+        {% endif %}
+      </select>
     </div>
 
     <div class="form-group">
diff --git a/assets/templates/partials/supplier_picker.html b/assets/templates/partials/supplier_picker.html
deleted file mode 100644
index 842290b3..00000000
--- a/assets/templates/partials/supplier_picker.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<select name="purchased_from" id="supplier_id" class="selectpicker">
-    {% if object.parent%}
-    <option value="{{object.parent.pk}}" selected>{{object.parent.name}}</option>
-    {% endif %}
-</select>
-
-{% load static %}
-{% block css %}
-    <link rel="stylesheet" href="{% static "css/bootstrap-select.min.css" %}"/>
-    <link rel="stylesheet" href="{% static "css/ajax-bootstrap-select.css" %}"/>
-{% endblock %}
-
-{% block preload_js %}
-    <script src="{% static "js/bootstrap-select.js" %}"></script>
-    <script src="{% static "js/ajax-bootstrap-select.js" %}"></script>
-{% endblock %}
-
-{% block js %}
-{{ js.super }}
-<script>
-$('#supplier_id')
-    .selectpicker({
-        liveSearch: true
-    })
-    .ajaxSelectPicker({
-        ajax: {
-            url: '{% url 'supplier_search_json'%}',
-            type: "get",
-            data: function () {
-                var params = {
-                    {% verbatim %}query: '{{{q}}}'{% endverbatim  %}
-                };
-                return params;
-            }
-        },
-        locale: {
-            emptyTitle: 'Search for supplier...'
-        },
-        preprocessData: function(data){
-            var suppliers = [];
-            if(data.length){
-                var len = data.length;
-                for(var i = 0; i < len; i++){
-                    var curr = data[i];
-                    suppliers.push(
-                        {
-                            'value': curr.id,
-                            'text': curr.name,
-                            'disabled': false
-                        }
-                    );
-                }
-                suppliers.push(
-                {
-                    'value': null,
-                    'text': "(no selection)"
-                });
-            }
-            return suppliers;
-        },
-        preserveSelected: false
-    });
-</script>
-{% endblock js %}