From 32be39774ff75e2c011f7f9a0b85a12950d0d994 Mon Sep 17 00:00:00 2001 From: Oliver Date: Sun, 28 Nov 2021 22:36:47 +1100 Subject: [PATCH] PEP fixes --- InvenTree/InvenTree/models.py | 2 +- InvenTree/InvenTree/serializers.py | 1 - InvenTree/build/serializers.py | 2 +- InvenTree/order/serializers.py | 1 - InvenTree/templates/js/translated/attachment.js | 3 ++- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/InvenTree/InvenTree/models.py b/InvenTree/InvenTree/models.py index 1b130cf599..0448a69781 100644 --- a/InvenTree/InvenTree/models.py +++ b/InvenTree/InvenTree/models.py @@ -116,7 +116,7 @@ class InvenTreeAttachment(models.Model): }) super().save(*args, **kwargs) - + def __str__(self): if self.attachment is not None: return os.path.basename(self.attachment.name) diff --git a/InvenTree/InvenTree/serializers.py b/InvenTree/InvenTree/serializers.py index 36d344c867..3785cfb292 100644 --- a/InvenTree/InvenTree/serializers.py +++ b/InvenTree/InvenTree/serializers.py @@ -289,7 +289,6 @@ class InvenTreeAttachmentSerializer(InvenTreeModelSerializer): ) - class InvenTreeImageSerializerField(serializers.ImageField): """ Custom image serializer. diff --git a/InvenTree/build/serializers.py b/InvenTree/build/serializers.py index 338e4a38b3..35a3bb3baa 100644 --- a/InvenTree/build/serializers.py +++ b/InvenTree/build/serializers.py @@ -16,7 +16,7 @@ from rest_framework import serializers from rest_framework.serializers import ValidationError from InvenTree.serializers import InvenTreeModelSerializer, InvenTreeAttachmentSerializer -from InvenTree.serializers import InvenTreeAttachmentSerializerField, UserSerializerBrief +from InvenTree.serializers import UserSerializerBrief import InvenTree.helpers from InvenTree.serializers import InvenTreeDecimalField diff --git a/InvenTree/order/serializers.py b/InvenTree/order/serializers.py index c1356d78c9..0528d57596 100644 --- a/InvenTree/order/serializers.py +++ b/InvenTree/order/serializers.py @@ -24,7 +24,6 @@ from InvenTree.serializers import InvenTreeAttachmentSerializer from InvenTree.serializers import InvenTreeModelSerializer from InvenTree.serializers import InvenTreeDecimalField from InvenTree.serializers import InvenTreeMoneySerializer -from InvenTree.serializers import InvenTreeAttachmentSerializerField from InvenTree.status_codes import StockStatus from part.serializers import PartBriefSerializer diff --git a/InvenTree/templates/js/translated/attachment.js b/InvenTree/templates/js/translated/attachment.js index fe8a0580c1..5c5af5682f 100644 --- a/InvenTree/templates/js/translated/attachment.js +++ b/InvenTree/templates/js/translated/attachment.js @@ -149,7 +149,8 @@ function loadAttachmentTable(url, options) { return renderLink(html, value); } else if (row.link) { - return renderLink(row.link, row.link); + var html = ` ${row.link}`; + return renderLink(html, row.link); } else { return '-'; }