Merge remote-tracking branch 'inventree/master'

InvenTree/InvenTree/helpers.py

@@ -5,7 +5,6 @@ Provides helper functions used throughout the InvenTree project
 import io
 import json
 import os.path
-from datetime import datetime
 from PIL import Image
 import requests
 
@@ -148,7 +147,6 @@ def MakeBarcode(object_type, object_id, object_url, data={}):
     data['id'] = object_id
     data['url'] = object_url
     data['tool'] = 'InvenTree'
-    data['generated'] = str(datetime.now().date())
 
     return json.dumps(data, sort_keys=True)
 

InvenTree/company/templates/company/company_base.html

@@ -7,15 +7,17 @@
 <div class="row">
     <div class="col-sm-6">
         <div class="media">
-          <div class="media-left">
+            <div class='media-left'>
-            <img class="part-thumb" id='company-thumb'
+                <div class='dropzone' id='company-thumb'>
-            {% if company.image %}
+                    <img class="part-thumb"
-            src="{{ company.image.url }}"
+                    {% if company.image %}
-            {% else %}
+                    src="{{ company.image.url }}"
-            src="{% static 'img/blank_image.png' %}"
+                    {% else %}
-            {% endif %}/>
+                    src="{% static 'img/blank_image.png' %}"
-          </div>
+                    {% endif %}/>
-          <div class='media-body'>
+                </div>
+            </div>
+            <div class='media-body'>
               <h4>{{ company.name }}</h4>
               <p>{{ company.description }}</p>
           </div>
@@ -68,6 +70,17 @@
 
 {% block js_ready %}
 
+    enableDragAndDrop(
+        "#company-thumb",
+        "{% url 'company-image' company.id %}",
+        {
+            label: 'image',
+            success: function(data, status, xhr) {
+                location.reload();
+            }
+        }
+    );
+
     $("#company-thumb").click(function() {
         launchModalForm(
                         "{% url 'company-image' company.id %}",

InvenTree/part/templates/part/part_base.html

@@ -13,17 +13,14 @@
 <div class="col-sm-6">
     <div class="media">
       <div class="media-left">
-        <form id='upload-photo' method='post' action="{% url 'part-image-upload' part.id %}">
+        <div class='dropzone' id='part-thumb'>
-            <div class='dropzone' id='part-thumb'>
                 <img class="part-thumb"
                 {% if part.image %}
                 src="{{ part.image.url }}"
                 {% else %}
                 src="{% static 'img/blank_image.png' %}"
                 {% endif %}/>
-            </div>
+        </div>
-                {% csrf_token %}
-        </form>
       </div>
     <div class="media-body">
         <h4>
@@ -102,34 +99,16 @@
 {% block js_ready %}
 {{ block.super }}
 
-    $('#part-thumb').on('drop', function(event) {
+    enableDragAndDrop(
-
+        '#part-thumb',
-        var transfer = event.originalEvent.dataTransfer;
+        "{% url 'part-image' part.id %}",
-
+        {
-        var formData = new FormData();
+            label: 'image',
-
+            success: function(data, status, xhr) {
-        if (isFileTransfer(transfer)) {
+                location.reload();
-            formData.append('image_file', transfer.files[0]);
-        } else if (isOnlineTransfer(transfer)) {
-            formData.append('image_url', getImageUrlFromTransfer(transfer));
-        } else {
-            console.log('Unknown transfer');
-            return;
-        }
- 
-        inventreeFormDataUpload(
-            "{% url 'part-image-upload' part.id %}",
-            formData,
-            {
-                success: function(data, status, xhr) {
-                    location.reload();
-                },
-                error: function(xhr, status, error) {
-                    showAlertDialog('Error uploading image', renderErrorMessage(xhr));
-                }
             }
-        );
+        }
-    });
+    );
 
     $("#show-qr-code").click(function() {
         launchModalForm(

InvenTree/part/urls.py

@@ -47,9 +47,6 @@ part_detail_urls = [
     
     url(r'^qr_code/?', views.PartQRCode.as_view(), name='part-qr'),
 
-    # Drag-and-drop thumbnail upload
-    url(r'^thumbnail-upload/?', views.UploadPartImage.as_view(), name='part-image-upload'),
-
     # Normal thumbnail with form
     url(r'^thumbnail/?', views.PartImage.as_view(), name='part-image'),
 

InvenTree/part/views.py

@@ -7,10 +7,6 @@ from __future__ import unicode_literals
 
 from django.shortcuts import get_object_or_404
 
-from django.core.validators import URLValidator
-from django.core.exceptions import ValidationError
-
-from django.http import JsonResponse
 from django.urls import reverse_lazy
 from django.views.generic import DetailView, ListView
 from django.forms.models import model_to_dict
@@ -33,7 +29,7 @@ from .forms import EditSupplierPartForm
 from InvenTree.views import AjaxView, AjaxCreateView, AjaxUpdateView, AjaxDeleteView
 from InvenTree.views import QRCodeView
 
-from InvenTree.helpers import DownloadFile, str2bool, TestIfImage, TestIfImageURL
+from InvenTree.helpers import DownloadFile, str2bool
 
 
 class PartIndex(ListView):
@@ -272,96 +268,6 @@ class PartImage(AjaxUpdateView):
         }
 
 
-class UploadPartImage(AjaxView):
-    """ View for uploading a Part image via AJAX request.
-    e.g. via a "drag and drop" event.
-
-    There are two ways to upload a file:
-
-    1. Attach an image file as request.FILES['image_file']
-        - Image is validated saved
-        - Part object is saved
-    2. Attach an iamge URL as request.POST['image_url']
-        NOT YET IMPLEMENTED
-        - Image URL is valiated
-        - Image is downloaded and validated
-        - Part object is saved
-    """
-
-    model = Part
-
-    def post(self, request, *args, **kwargs):
-
-        response = {}
-        status = 200
-
-        try:
-            part = Part.objects.get(pk=kwargs.get('pk'))
-        except Part.DoesNotExist:
-            response['error'] = 'Part not found'
-            return JsonResponse(response, status=404)
-
-        # Direct image upload
-        if 'image_file' in request.FILES:
-            image = request.FILES['image_file']
-
-            if TestIfImage(image):
-                part.image = image
-                part.clean()
-                part.save()
-
-                response['success'] = 'File was uploaded successfully'
-                status = 200
-            else:
-                response['error'] = 'Not a valid image file'
-                status = 400
-
-            return JsonResponse(response, status=status)
-
-        elif 'image_url' in request.POST:
-            image_url = str(request.POST['image_url']).split('?')[0]
-
-            validator = URLValidator()
-
-            try:
-                validator(image_url)
-            except ValidationError:
-                response['error'] = 'Invalid image URL'
-                response['url'] = image_url
-
-                return JsonResponse(response, status=400)
-
-            # Test the the URL at least looks like an image
-            if not TestIfImageURL(image_url):
-                response['error'] = 'Invalid image URL'
-                response['url'] = image_url
-                return JsonResponse(response, status=400)
-
-            response['error'] = 'Cannot download cross-site images (yet)'
-            response['url'] = image_url
-            response['apology'] = 'deepest'
-
-            return JsonResponse(response, status=400)
-
-            # TODO - Attempt to download the image file here
-
-            """
-            head = requests.head(url, stream=True, headers={'User-agent': 'Mozilla/5.0'})
-
-            if head.headers['Content-Length'] < SOME_MAX_LENGTH:
-
-                image = requests.get(url, stream=True, headers={'User-agent': 'Mozilla/5.0'})
-
-                file = io.BytesIO(image.raw.read())
-
-                - Save the file?
-
-            """
-
-        # Default response
-        return JsonResponse(response, status=status)
-
-
 class PartEdit(AjaxUpdateView):
     """ View for editing Part object """
 

InvenTree/static/script/inventree/inventree.js

@@ -69,4 +69,52 @@ function getImageUrlFromTransfer(transfer) {
     console.log('Image URL: ' + url);
 
     return url;
+}
+
+
+function enableDragAndDrop(element, url, options) {
+    /* Enable drag-and-drop file uploading for a given element.
+    
+    Params:
+        element - HTML element lookup string e.g. "#drop-div"
+        url - URL to POST the file to
+        options - object with following possible values:
+            label - Label of the file to upload (default='file')
+            success - Callback function in case of success
+            error - Callback function in case of error
+    */
+
+    $(element).on('drop', function(event) {
+
+        var transfer = event.originalEvent.dataTransfer;
+
+        var label = options.label || 'file';
+
+        var formData = new FormData();
+
+        if (isFileTransfer(transfer)) {
+            formData.append(label, transfer.files[0]);
+            
+            inventreeFormDataUpload(
+                url,
+                formData,
+                {
+                    success: function(data, status, xhr) {
+                        console.log('Uploaded file via drag-and-drop');
+                        if (options.success) {
+                            options.success(data, status, xhr);
+                        }
+                    },
+                    error: function(xhr, status, error) {
+                        console.log('File upload failed');
+                        if (options.error) {
+                            options.error(xhr, status, error);
+                        }
+                    }
+                }
+            );
+        } else {
+            console.log('Ignoring drag-and-drop event (not a file)');
+        }
+    });
 }