From 4b4db50de5942849f7c6b3cb04b129f5949328ba Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Thu, 10 May 2018 21:20:12 +1000
Subject: [PATCH] Display username in stock-tracking

- Add UserSerializer
---
 InvenTree/InvenTree/serializers.py        | 19 +++++++++++++++++++
 InvenTree/stock/serializers.py            |  4 +++-
 InvenTree/stock/templates/stock/item.html |  3 +++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/InvenTree/InvenTree/serializers.py b/InvenTree/InvenTree/serializers.py
index 36daafad1d..590152a331 100644
--- a/InvenTree/InvenTree/serializers.py
+++ b/InvenTree/InvenTree/serializers.py
@@ -5,6 +5,25 @@ from rest_framework import serializers
 from rest_framework import generics
 from rest_framework import mixins
 
+from django.contrib.auth.models import User
+
+class UserSerializer(serializers.ModelSerializer):
+
+    class Meta:
+        model = User
+        fields = 'all'
+
+
+class UserSerializerBrief(serializers.ModelSerializer):
+
+    class Meta:
+        model = User
+        fields = [
+            'pk',
+            'username',
+        ]
+
+
 class DraftRUDView(generics.RetrieveAPIView, generics.UpdateAPIView, generics.DestroyAPIView):
 
     def perform_update(self, serializer):
diff --git a/InvenTree/stock/serializers.py b/InvenTree/stock/serializers.py
index 16ef568616..6479e4aa88 100644
--- a/InvenTree/stock/serializers.py
+++ b/InvenTree/stock/serializers.py
@@ -4,7 +4,7 @@ from .models import StockItem, StockLocation
 from .models import StockItemTracking
 
 from part.serializers import PartBriefSerializer
-
+from InvenTree.serializers import UserSerializer, UserSerializerBrief
 
 class LocationBriefSerializer(serializers.ModelSerializer):
 
@@ -24,6 +24,8 @@ class StockTrackingSerializer(serializers.ModelSerializer):
 
     url = serializers.CharField(source='get_absolute_url', read_only=True)
 
+    user = UserSerializerBrief(many=False, read_only=True)
+
     class Meta:
         model = StockItemTracking
         fields = [
diff --git a/InvenTree/stock/templates/stock/item.html b/InvenTree/stock/templates/stock/item.html
index 5077b6bba0..448c199ce3 100644
--- a/InvenTree/stock/templates/stock/item.html
+++ b/InvenTree/stock/templates/stock/item.html
@@ -214,6 +214,9 @@
                 sortable: true,
                 field: 'user',
                 title: 'User',
+                formatter: function(value, row, index, field) {
+                    return value.username;
+                }
             }
         ],
         url: "{% url 'api-stock-track' %}",