From 26eafe242c18eca230cf4d2d5a3e9a54610f9fe9 Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Wed, 30 Jun 2021 00:18:25 +1000
Subject: [PATCH] Replace PartImageUpload form

---
 .../templates/company/company_base.html       | 21 ++++++------
 InvenTree/part/templates/part/part_base.html  | 34 +++++++++++++------
 InvenTree/part/urls.py                        |  1 -
 InvenTree/part/views.py                       | 15 --------
 4 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/InvenTree/company/templates/company/company_base.html b/InvenTree/company/templates/company/company_base.html
index 52d5abf3e6..88b9f2958d 100644
--- a/InvenTree/company/templates/company/company_base.html
+++ b/InvenTree/company/templates/company/company_base.html
@@ -133,6 +133,14 @@
             });
     });
 
+    function reloadImage(data) {
+        if (data.image) {
+            $('#company-image').attr('src', data.image);
+        } else {
+            location.reload();
+        }
+    }
+
     enableDragAndDrop(
         "#company-thumb",
         "{% url 'api-company-detail' company.id %}",
@@ -140,12 +148,7 @@
             label: 'image',
             method: 'PATCH',
             success: function(data, status, xhr) {
-
-                if (data.image) {
-                    $('#company-image').attr('src', data.image);
-                } else {
-                    location.reload();
-                }
+                reloadImage(data);
             }
         }
     );
@@ -167,11 +170,7 @@
                 },
                 title: '{% trans "Upload Image" %}',
                 onSuccess: function(data) {
-                    if (data.image) {
-                        $('#company-image').attr('src', data.image);
-                    } else {
-                        location.reload();
-                    }
+                    reloadImage(data);
                 }
             }
         );
diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html
index b486e2c589..922ff01912 100644
--- a/InvenTree/part/templates/part/part_base.html
+++ b/InvenTree/part/templates/part/part_base.html
@@ -237,6 +237,16 @@
     });
     {% endif %}
 
+    function reloadImage(data) {
+        // If image / thumbnail data present, live update
+        if (data.image) {
+            $('#part-image').attr('src', data.image);
+        } else {
+            // Otherwise, reload the page
+            location.reload();
+        }
+    }
+
     enableDragAndDrop(
         '#part-thumb',
         "{% url 'api-part-detail' part.id %}",
@@ -244,14 +254,7 @@
             label: 'image',
             method: 'PATCH',
             success: function(data, status, xhr) {
-
-                // If image / thumbnail data present, live update
-                if (data.image) {
-                    $('#part-image').attr('src', data.image);
-                } else {
-                    // Otherwise, reload the page
-                    location.reload();
-                }
+                reloadImage(data);
             }
         }
     );
@@ -293,11 +296,20 @@
     });
 
     $("#part-image-upload").click(function() {
-        launchModalForm("{% url 'part-image-upload' part.id %}",
+
+        constructForm(
+            '{% url "api-part-detail" part.pk %}',
             {
-                reload: true
+                method: 'PATCH',
+                fields: {
+                    image: {},
+                },
+                title: '{% trans "Upload Image" %}',
+                onSuccess: function(data) {
+                    reloadImage(data);
+                }
             }
-        );
+        )
     });
 
 
diff --git a/InvenTree/part/urls.py b/InvenTree/part/urls.py
index c35786e5d3..fb4a1ab9eb 100644
--- a/InvenTree/part/urls.py
+++ b/InvenTree/part/urls.py
@@ -81,7 +81,6 @@ part_detail_urls = [
     url(r'^qr_code/?', views.PartQRCode.as_view(), name='part-qr'),
 
     # Normal thumbnail with form
-    url(r'^thumbnail/?', views.PartImageUpload.as_view(), name='part-image-upload'),
     url(r'^thumb-select/?', views.PartImageSelect.as_view(), name='part-image-select'),
     url(r'^thumb-download/', views.PartImageDownloadFromURL.as_view(), name='part-image-download'),
 
diff --git a/InvenTree/part/views.py b/InvenTree/part/views.py
index 2f129dd30b..9998a12783 100644
--- a/InvenTree/part/views.py
+++ b/InvenTree/part/views.py
@@ -1186,21 +1186,6 @@ class PartImageDownloadFromURL(AjaxUpdateView):
         )
 
 
-class PartImageUpload(AjaxUpdateView):
-    """ View for uploading a new Part image """
-
-    model = Part
-    ajax_template_name = 'modal_form.html'
-    ajax_form_title = _('Upload Part Image')
-
-    form_class = part_forms.PartImageForm
-
-    def get_data(self):
-        return {
-            'success': _('Updated part image'),
-        }
-
-
 class PartImageSelect(AjaxUpdateView):
     """ View for selecting Part image from existing images. """