inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-30 04:26:44 +00:00
Code

Add try/except around callable default

Browse Source
This commit is contained in:
Oliver Walters 2021-06-27 01:18:09 +10:00
parent 0cc999410b
commit 34a374ce9a
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
InvenTree/InvenTree/serializers.py
View File

@ -70,7 +70,10 @@ class InvenTreeModelSerializer(serializers.ModelSerializer):
# Account for callable functions # Account for callable functions
if callable(value): if callable(value):
try:
value = value() value = value()
except:
continue
data[field_name] = value data[field_name] = value
@ -98,7 +101,10 @@ class InvenTreeModelSerializer(serializers.ModelSerializer):
# Account for callable functions # Account for callable functions
if callable(value): if callable(value):
try:
value = value() value = value()
except:
continue
initials[field_name] = value initials[field_name] = value

2
InvenTree/part/test_api.py
View File

@ -603,8 +603,6 @@ class PartDetailTests(InvenTreeAPITestCase):
# And now check that the image has been set # And now check that the image has been set
p = Part.objects.get(pk=pk) p = Part.objects.get(pk=pk)
print("Image:", p.image.file)
class PartAPIAggregationTest(InvenTreeAPITestCase): class PartAPIAggregationTest(InvenTreeAPITestCase):
""" """