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

Merge pull request #2041 from SchrodingersGat/metadata-fixes

Browse Source 
Fix OPTIONS request lookup time
This commit is contained in:
Oliver 2021-09-08 12:52:00 +10:00 committed by GitHub
commit ba787a0485
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
InvenTree/InvenTree/metadata.py
View File

@ -98,10 +98,12 @@ class InvenTreeMetadata(SimpleMetadata):
serializer_info = super().get_serializer_info(serializer) serializer_info = super().get_serializer_info(serializer)
try: model_class = None
ModelClass = serializer.Meta.model
model_fields = model_meta.get_field_info(ModelClass) try:
model_class = serializer.Meta.model
model_fields = model_meta.get_field_info(model_class)
# Iterate through simple fields # Iterate through simple fields
for name, field in model_fields.fields.items(): for name, field in model_fields.fields.items():
@ -146,11 +148,23 @@ class InvenTreeMetadata(SimpleMetadata):
if hasattr(serializer, 'instance'): if hasattr(serializer, 'instance'):
instance = serializer.instance instance = serializer.instance
if instance is None: if instance is None and model_class is not None:
try: # Attempt to find the instance based on kwargs lookup
instance = self.view.get_object() kwargs = getattr(self.view, 'kwargs', None)
except:
pass if kwargs:
pk = None
for field in ['pk', 'id', 'PK', 'ID']:
if field in kwargs:
pk = kwargs[field]
break
if pk is not None:
try:
instance = model_class.objects.get(pk=pk)
except (ValueError, model_class.DoesNotExist):
pass
if instance is not None: if instance is not None:
""" """