2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-07-01 03:00:54 +00:00

Merge remote-tracking branch 'inventree/master'

This commit is contained in:
Oliver Walters
2020-05-26 21:53:20 +10:00
4 changed files with 52 additions and 0 deletions

View File

@ -15,6 +15,7 @@ from django.db.models.functions import Coalesce
from company.serializers import SupplierPartSerializer
from part.serializers import PartBriefSerializer
from InvenTree.serializers import UserSerializerBrief, InvenTreeModelSerializer
from InvenTree.serializers import InvenTreeAttachmentSerializerField
class LocationBriefSerializer(InvenTreeModelSerializer):
@ -211,6 +212,8 @@ class StockItemAttachmentSerializer(InvenTreeModelSerializer):
user_detail = UserSerializerBrief(source='user', read_only=True)
attachment = InvenTreeAttachmentSerializerField(required=True)
class Meta:
model = StockItemAttachment
@ -224,6 +227,12 @@ class StockItemAttachmentSerializer(InvenTreeModelSerializer):
'user_detail',
]
read_only_fields = [
'upload_date',
'user',
'user_detail'
]
class StockItemTestResultSerializer(InvenTreeModelSerializer):
""" Serializer for the StockItemTestResult model """
@ -232,6 +241,8 @@ class StockItemTestResultSerializer(InvenTreeModelSerializer):
key = serializers.CharField(read_only=True)
attachment = InvenTreeAttachmentSerializerField(required=False)
def __init__(self, *args, **kwargs):
user_detail = kwargs.pop('user_detail', False)