Merge remote-tracking branch 'inventree/master'

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
 
@@ -478,6 +479,23 @@ class StockList(generics.ListCreateAPIView):
 
         if sales_order:
             queryset = queryset.filter(sales_order=sales_order)
+
+        # Filter by "serialized" status?
+        serialized = params.get('serialized', None)
+
+        if serialized is not None:
+            serialized = str2bool(serialized)
+
+            if serialized:
+                queryset = queryset.exclude(serial=None)
+            else:
+                queryset = queryset.filter(serial=None)
+
+        # Filter by serial number?
+        serial_number = params.get('serial', None)
+
+        if serial_number is not None:
+            queryset = queryset.filter(serial=serial_number)
         
         in_stock = self.request.query_params.get('in_stock', None)
 
@@ -628,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)
     """
@@ -636,12 +654,6 @@ class StockAttachmentList(generics.ListCreateAPIView):
     queryset = StockItemAttachment.objects.all()
     serializer_class = StockItemAttachmentSerializer
 
-    filter_backends = [
-        DjangoFilterBackend,
-        filters.OrderingFilter,
-        filters.SearchFilter,
-    ]
-
     filter_fields = [
         'stock_item',
     ]

InvenTree/stock/migrations/0037_stockitemattachment_user.py

@@ -0,0 +1,21 @@
+# Generated by Django 3.0.5 on 2020-05-12 10:33
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('stock', '0036_stockitemattachment'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='stockitemattachment',
+            name='user',
+            field=models.ForeignKey(blank=True, help_text='User', null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL),
+        ),
+    ]

InvenTree/stock/migrations/0038_stockitemattachment_upload_date.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.5 on 2020-05-12 10:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('stock', '0037_stockitemattachment_user'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='stockitemattachment',
+            name='upload_date',
+            field=models.DateField(auto_now_add=True, null=True),
+        ),
+    ]

InvenTree/stock/serializers.py

@@ -193,6 +193,16 @@ class LocationSerializer(InvenTreeModelSerializer):
 class StockItemAttachmentSerializer(InvenTreeModelSerializer):
     """ Serializer for StockItemAttachment model """
 
+    def __init_(self, *args, **kwargs):
+        user_detail = kwargs.pop('user_detail', False)
+
+        super().__init__(*args, **kwargs)
+
+        if user_detail is not True:
+            self.fields.pop('user_detail')
+
+    user_detail = UserSerializerBrief(source='user', read_only=True)
+
     class Meta:
         model = StockItemAttachment
 
@@ -200,7 +210,9 @@ class StockItemAttachmentSerializer(InvenTreeModelSerializer):
             'pk',
             'stock_item',
             'attachment',
-            'comment'
+            'comment',
+            'user',
+            'user_detail',
         ]
 
 

InvenTree/stock/templates/stock/item_attachments.html

@@ -10,40 +10,7 @@
 <hr>
 <h4>{% trans "Stock Item Attachments" %}</h4>
 
-
-<div id='attachment-buttons'>
-    <div class="btn-group">
-        <button type='button' class='btn btn-success' id='new-attachment'>{% trans "Add Attachment" %}</button>
-    </div>
-</div>
-
-<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></th>
-        </tr>
-    </thead>
-    <tbody>
-        {% for attachment in item.attachments.all %}
-        <tr>
-            <td><a href='/media/{{ attachment.attachment }}'>{{ attachment.basename }}</a></td>
-            <td>{{ attachment.comment }}</td>
-            <td>
-                <div class='btn-group' style='float: right;'>    
-                    <button type='button' class='btn btn-default btn-glyph attachment-edit-button' url="{% url 'stock-item-attachment-edit' attachment.id %}" data-toggle='tooltip' title='{% trans "Edit attachment" %}'>
-                        <span class='fas fa-edit'/>
-                    </button>
-                    <button type='button' class='btn btn-default btn-glyph attachment-delete-button' url="{% url 'stock-item-attachment-delete' attachment.id %}" data-toggle='tooltip' title='{% trans "Delete attachment" %}'>
-                        <span class='fas fa-trash-alt icon-red'/>
-                    </button>
-                </div>
-            </td>
-        </tr>
-        {% endfor %}
-    </tbody>
-</table>
+{% include "attachment_table.html" with attachments=item.attachments.all %}
 
 {% endblock %}
 
@@ -60,7 +27,9 @@ $("#new-attachment").click(function() {
 $("#attachment-table").on('click', '.attachment-edit-button', function() {
     var button = $(this);
 
-    launchModalForm(button.attr('url'), 
+    var url = `/stock/item/attachment/${button.attr('pk')}/edit/`;
+
+    launchModalForm(url, 
         {
             reload: true,
         });
@@ -69,7 +38,9 @@ $("#attachment-table").on('click', '.attachment-edit-button', function() {
 $("#attachment-table").on('click', '.attachment-delete-button', function() {
     var button = $(this);
 
-    launchModalForm(button.attr('url'), {
+    var url = `/stock/item/attachment/${button.attr('pk')}/delete/`;
+
+    launchModalForm(url, {
         success: function() {
             location.reload();
         }

InvenTree/stock/views.py

@@ -160,6 +160,12 @@ class StockItemAttachmentCreate(AjaxCreateView):
     ajax_form_title = _("Add Stock Item Attachment")
     ajax_template_name = "modal_form.html"
 
+    def post_save(self, **kwargs):
+        """ Record the user that uploaded the attachment """
+        
+        self.object.user = self.request.user
+        self.object.save()
+
     def get_data(self):
         return {
             'success': _("Added attachment")