mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Fixes #3039: Fix exception when retrieving change object for a component template via API

Browse Source
This commit is contained in:
Jeremy Stretch
2019-04-04 15:00:59 -04:00
parent 1e160fd9e9
commit 858be6d216
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -2,6 +2,7 @@ v2.5.10 (FUTURE)
## Bug Fixes ## Bug Fixes
* [#3039](https://github.com/digitalocean/netbox/issues/3039) - Fix exception when retrieving change object for a component template via API
* [#3041](https://github.com/digitalocean/netbox/issues/3041) - Fix form widget for bulk cable label update * [#3041](https://github.com/digitalocean/netbox/issues/3041) - Fix form widget for bulk cable label update
--- ---

14
netbox/extras/api/serializers.py
View File

@ -16,7 +16,8 @@ from tenancy.api.nested_serializers import NestedTenantSerializer, NestedTenantG
from tenancy.models import Tenant, TenantGroup from tenancy.models import Tenant, TenantGroup
from users.api.nested_serializers import NestedUserSerializer from users.api.nested_serializers import NestedUserSerializer
from utilities.api import ( from utilities.api import (
ChoiceField, ContentTypeField, get_serializer_for_model, SerializedPKRelatedField, ValidatedModelSerializer, ChoiceField, ContentTypeField, get_serializer_for_model, SerializerNotFound, SerializedPKRelatedField,
ValidatedModelSerializer,
) )
from .nested_serializers import * from .nested_serializers import *
@ -235,9 +236,14 @@ class ObjectChangeSerializer(serializers.ModelSerializer):
""" """
if obj.changed_object is None: if obj.changed_object is None:
return None return None
serializer = get_serializer_for_model(obj.changed_object, prefix='Nested')
if serializer is None: try:
serializer = get_serializer_for_model(obj.changed_object, prefix='Nested')
except SerializerNotFound:
return obj.object_repr return obj.object_repr
context = {'request': self.context['request']} context = {
'request': self.context['request']
}
data = serializer(obj.changed_object, context=context).data data = serializer(obj.changed_object, context=context).data
return data return data