From 366d4b214390f454809b446016136843e617beaf Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Tue, 12 May 2020 21:40:42 +1000
Subject: [PATCH] Add new attechment functionality to new models

- Giving the ol' refactor tractor a fresh coat of paint
---
 InvenTree/InvenTree/api.py                    | 25 +++++++++++++++++++
 InvenTree/order/api.py                        | 17 +++----------
 .../order/templates/order/po_attachments.html |  9 +++++--
 .../order/templates/order/so_attachments.html | 11 +++++---
 InvenTree/order/views.py                      |  8 ++++++
 InvenTree/part/api.py                         | 11 ++------
 .../part/templates/part/attachments.html      |  9 +++++--
 InvenTree/part/views.py                       |  5 ++++
 InvenTree/stock/api.py                        | 15 ++---------
 .../templates/stock/item_attachments.html     |  6 ++---
 10 files changed, 70 insertions(+), 46 deletions(-)

diff --git a/InvenTree/InvenTree/api.py b/InvenTree/InvenTree/api.py
index abb6102a6f..eb87b8f77a 100644
--- a/InvenTree/InvenTree/api.py
+++ b/InvenTree/InvenTree/api.py
@@ -8,6 +8,9 @@ from __future__ import unicode_literals
 from django.utils.translation import ugettext as _
 from django.http import JsonResponse
 
+from django_filters.rest_framework import DjangoFilterBackend
+from rest_framework import filters
+
 from rest_framework import permissions
 from rest_framework.response import Response
 from rest_framework.views import APIView
@@ -41,6 +44,28 @@ class InfoView(AjaxView):
         return JsonResponse(data)
 
 
+class AttachmentMixin:
+    """
+    Mixin for creating attachment objects,
+    and ensuring the user information is saved correctly.
+    """
+
+    permission_classes = [permissions.IsAuthenticated]
+
+    filter_backends = [
+        DjangoFilterBackend,
+        filters.OrderingFilter,
+        filters.SearchFilter,
+    ]
+
+    def perform_create(self, serializer):
+        """ Save the user information when a file is uploaded """
+
+        attachment = serializer.save()
+        attachment.user = self.request.user
+        attachment.save()
+
+
 class ActionPluginView(APIView):
     """
     Endpoint for running custom action plugins.
diff --git a/InvenTree/order/api.py b/InvenTree/order/api.py
index cb48b4c11d..dba493baab 100644
--- a/InvenTree/order/api.py
+++ b/InvenTree/order/api.py
@@ -12,6 +12,7 @@ from rest_framework import filters
 from django.conf.urls import url, include
 
 from InvenTree.helpers import str2bool
+from InvenTree.api import AttachmentMixin
 
 from part.models import Part
 from company.models import SupplierPart
@@ -200,7 +201,7 @@ class POLineItemDetail(generics.RetrieveUpdateAPIView):
     ]
 
 
-class SOAttachmentList(generics.ListCreateAPIView):
+class SOAttachmentList(generics.ListCreateAPIView, AttachmentMixin):
     """
     API endpoint for listing (and creating) a SalesOrderAttachment (file upload)
     """
@@ -208,12 +209,6 @@ class SOAttachmentList(generics.ListCreateAPIView):
     queryset = SalesOrderAttachment.objects.all()
     serializer_class = SOAttachmentSerializer
 
-    filter_backends = [
-        DjangoFilterBackend,
-        filters.OrderingFilter,
-        filters.SearchFilter,
-    ]
-
     filter_fields = [
         'order',
     ]
@@ -399,7 +394,7 @@ class SOLineItemDetail(generics.RetrieveUpdateAPIView):
     permission_classes = [permissions.IsAuthenticated]
 
 
-class POAttachmentList(generics.ListCreateAPIView):
+class POAttachmentList(generics.ListCreateAPIView, AttachmentMixin):
     """
     API endpoint for listing (and creating) a PurchaseOrderAttachment (file upload)
     """
@@ -407,12 +402,6 @@ class POAttachmentList(generics.ListCreateAPIView):
     queryset = PurchaseOrderAttachment.objects.all()
     serializer_class = POAttachmentSerializer
 
-    filter_backends = [
-        DjangoFilterBackend,
-        filters.OrderingFilter,
-        filters.SearchFilter,
-    ]
-
     filter_fields = [
         'order',
     ]
diff --git a/InvenTree/order/templates/order/po_attachments.html b/InvenTree/order/templates/order/po_attachments.html
index 388b7197b6..79a0105a61 100644
--- a/InvenTree/order/templates/order/po_attachments.html
+++ b/InvenTree/order/templates/order/po_attachments.html
@@ -21,8 +21,9 @@
 <table class='table table-striped table-condensed' data-toolbar='#attachment-buttons' id='attachment-table'>
     <thead>
         <tr>
-            <th data-field='file' data-searchable='true'>{% trans "File" %}</th>
-            <th data-field='comment' data-searchable='true'>{% trans "Comment" %}</th>
+            <th data-field='file' data-sortable='true' data-searchable='true'>{% trans "File" %}</th>
+            <th data-field='comment' data-sortable='true' data-searchable='true'>{% trans "Comment" %}</th>
+            <th data-field='user' data-sortable='true' data-searchable='true'>{% trans "Uploaded" %}</th>
             <th></th>
         </tr>
     </thead>
@@ -31,6 +32,10 @@
         <tr>
             <td><a href='/media/{{ attachment.attachment }}'>{{ attachment.basename }}</a></td>
             <td>{{ attachment.comment }}</td>
+            <td>
+                {% if attachment.upload_date %}{{ attachment.upload_date }}{% endif %}
+                {% if attachment.user %}<span class='badge'>{{ attachment.user.username }}</div>{% endif %}
+            </td>
             <td>
                 <div class='btn-group' style='float: right;'>    
                     <button type='button' class='btn btn-default btn-glyph attachment-edit-button' url="{% url 'po-attachment-edit' attachment.id %}" data-toggle='tooltip' title='{% trans "Edit attachment" %}'>
diff --git a/InvenTree/order/templates/order/so_attachments.html b/InvenTree/order/templates/order/so_attachments.html
index ca4170beff..228d42c445 100644
--- a/InvenTree/order/templates/order/so_attachments.html
+++ b/InvenTree/order/templates/order/so_attachments.html
@@ -8,7 +8,7 @@
 
 {% include 'order/so_tabs.html' with tab='attachments' %}
 
-<h4>{% trans "Sales Order Attachments" %}
+<h4>{% trans "Sales Order Attachments" %}</h4>
 
 <hr>
 
@@ -21,8 +21,9 @@
 <table class='table table-striped table-condensed' data-toolbar='#attachment-buttons' id='attachment-table'>
     <thead>
         <tr>
-            <th data-field='file' data-searchable='true'>{% trans "File" %}</th>
-            <th data-field='comment' data-searchable='true'>{% trans "Comment" %}</th>
+            <th data-field='file' data-sortable='true' data-searchable='true'>{% trans "File" %}</th>
+            <th data-field='comment' data-sortable='true' data-searchable='true'>{% trans "Comment" %}</th>
+            <th data-field='user' data-sortable='true' data-sortable='true' data-searchable='true'>{% trans "Uploaded" %}</th>
             <th></th>
         </tr>
     </thead>
@@ -31,6 +32,10 @@
         <tr>
             <td><a href='/media/{{ attachment.attachment }}'>{{ attachment.basename }}</a></td>
             <td>{{ attachment.comment }}</td>
+            <td>
+                {% if attachment.upload_date %}{{ attachment.upload_date }}{% endif %}
+                {% if attachment.user %}<span class='badge'>{{ attachment.user.username }}</div>{% endif %}
+            </td>
             <td>
                 <div class='btn-group' style='float: right;'>    
                     <button type='button' class='btn btn-default btn-glyph attachment-edit-button' url="{% url 'so-attachment-edit' attachment.id %}" data-toggle='tooltip' title='{% trans "Edit attachment" %}'>
diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py
index 02132d34cc..370c629cac 100644
--- a/InvenTree/order/views.py
+++ b/InvenTree/order/views.py
@@ -93,6 +93,10 @@ class PurchaseOrderAttachmentCreate(AjaxCreateView):
     ajax_form_title = _("Add Purchase Order Attachment")
     ajax_template_name = "modal_form.html"
 
+    def post_save(self, **kwargs):
+        self.object.user = self.request.user
+        self.object.save()
+
     def get_data(self):
         return {
             "success": _("Added attachment")
@@ -133,6 +137,10 @@ class SalesOrderAttachmentCreate(AjaxCreateView):
     form_class = order_forms.EditSalesOrderAttachmentForm
     ajax_form_title = _('Add Sales Order Attachment')
 
+    def post_save(self, **kwargs):
+        self.object.user = self.request.user
+        self.object.save()
+
     def get_data(self):
         return {
             'success': _('Added attachment')
diff --git a/InvenTree/part/api.py b/InvenTree/part/api.py
index eb14e93a9a..84ff83af0a 100644
--- a/InvenTree/part/api.py
+++ b/InvenTree/part/api.py
@@ -25,6 +25,7 @@ from . import serializers as part_serializers
 
 from InvenTree.views import TreeSerializer
 from InvenTree.helpers import str2bool, isNull
+from InvenTree.api import AttachmentMixin
 
 
 class PartCategoryTree(TreeSerializer):
@@ -106,7 +107,7 @@ class CategoryDetail(generics.RetrieveUpdateDestroyAPIView):
     queryset = PartCategory.objects.all()
 
 
-class PartAttachmentList(generics.ListCreateAPIView):
+class PartAttachmentList(generics.ListCreateAPIView, AttachmentMixin):
     """
     API endpoint for listing (and creating) a PartAttachment (file upload).
     """
@@ -114,14 +115,6 @@ class PartAttachmentList(generics.ListCreateAPIView):
     queryset = PartAttachment.objects.all()
     serializer_class = part_serializers.PartAttachmentSerializer
 
-    permission_classes = [permissions.IsAuthenticated]
-
-    filter_backends = [
-        DjangoFilterBackend,
-        filters.OrderingFilter,
-        filters.SearchFilter,
-    ]
-
     filter_fields = [
         'part',
     ]
diff --git a/InvenTree/part/templates/part/attachments.html b/InvenTree/part/templates/part/attachments.html
index b89a40e654..f569ae207a 100644
--- a/InvenTree/part/templates/part/attachments.html
+++ b/InvenTree/part/templates/part/attachments.html
@@ -19,8 +19,9 @@
 <table class='table table-striped table-condensed' data-toolbar='#attachment-buttons' id='attachment-table'>
     <thead>
         <tr>
-            <th data-field='file' data-searchable='true'>{% trans "File" %}</th>
-            <th data-field='comment' data-searchable='true'>{% trans "Comment" %}</th>
+            <th data-field='file' data-sortable='true' data-searchable='true'>{% trans "File" %}</th>
+            <th data-field='comment' data-sortable='true' data-searchable='true'>{% trans "Comment" %}</th>
+            <th data-field='user' data-sortable='true' data-searchable='true'>{% trans "Uploaded" %}</th>
             <th></th>
         </tr>
     </thead>
@@ -29,6 +30,10 @@
         <tr>
             <td><a href='/media/{{ attachment.attachment }}'>{{ attachment.basename }}</a></td>
             <td>{{ attachment.comment }}</td>
+            <td>
+                {% if attachment.upload_date %}{{ attachment.upload_date }}{% endif %}
+                {% if attachment.user %}<span class='badge'>{{ attachment.user.username }}</div>{% endif %}
+            </td>
             <td>
                 <div class='btn-group' style='float: right;'>    
                     <button type='button' class='btn btn-default btn-glyph attachment-edit-button' url="{% url 'part-attachment-edit' attachment.id %}" data-toggle='tooltip' title='{% trans "Edit attachment" %}'>
diff --git a/InvenTree/part/views.py b/InvenTree/part/views.py
index 89a285cf60..ce2fc415be 100644
--- a/InvenTree/part/views.py
+++ b/InvenTree/part/views.py
@@ -74,6 +74,11 @@ class PartAttachmentCreate(AjaxCreateView):
     ajax_form_title = _("Add part attachment")
     ajax_template_name = "modal_form.html"
 
+    def post_save(self):
+        """ Record the user that uploaded the attachment """
+        self.object.user = self.request.user
+        self.object.save()
+
     def get_data(self):
         return {
             'success': _('Added attachment')
diff --git a/InvenTree/stock/api.py b/InvenTree/stock/api.py
index 2c1d4916f6..1c654d8b3c 100644
--- a/InvenTree/stock/api.py
+++ b/InvenTree/stock/api.py
@@ -29,6 +29,7 @@ from .serializers import StockItemAttachmentSerializer
 
 from InvenTree.views import TreeSerializer
 from InvenTree.helpers import str2bool, isNull
+from InvenTree.api import AttachmentMixin
 
 from decimal import Decimal, InvalidOperation
 
@@ -645,7 +646,7 @@ class StockList(generics.ListCreateAPIView):
     ]
 
 
-class StockAttachmentList(generics.ListCreateAPIView):
+class StockAttachmentList(generics.ListCreateAPIView, AttachmentMixin):
     """
     API endpoint for listing (and creating) a StockItemAttachment (file upload)
     """
@@ -653,22 +654,10 @@ class StockAttachmentList(generics.ListCreateAPIView):
     queryset = StockItemAttachment.objects.all()
     serializer_class = StockItemAttachmentSerializer
 
-    filter_backends = [
-        DjangoFilterBackend,
-        filters.OrderingFilter,
-        filters.SearchFilter,
-    ]
-
     filter_fields = [
         'stock_item',
     ]
 
-    def perform_create(self, serializer):
-
-        attachment = serializer.save()
-        attachment.user = self.request.user
-        attachment.save()
-
 
 class StockTrackingList(generics.ListCreateAPIView):
     """ API endpoint for list view of StockItemTracking objects.
diff --git a/InvenTree/stock/templates/stock/item_attachments.html b/InvenTree/stock/templates/stock/item_attachments.html
index 4a6829bfcc..34eaa61703 100644
--- a/InvenTree/stock/templates/stock/item_attachments.html
+++ b/InvenTree/stock/templates/stock/item_attachments.html
@@ -20,9 +20,9 @@
 <table class='table table-striped table-condensed' data-toolbar='#attachment-buttons' id='attachment-table'>
     <thead>
         <tr>
-            <th data-field='file' data-searchable='true'>{% trans "File" %}</th>
-            <th data-field='comment' data-searchable='true'>{% trans "Comment" %}</th>
-            <th data-field='user' data-searchable='true'>{% trans "Uploaded" %}</th>
+            <th data-field='file' data-sortable='true' data-searchable='true'>{% trans "File" %}</th>
+            <th data-field='comment' data-sortable='true' data-searchable='true'>{% trans "Comment" %}</th>
+            <th data-field='user' data-sortable='true' data-searchable='true'>{% trans "Uploaded" %}</th>
             <th></th>
         </tr>
     </thead>