Skip to content

Commit

Permalink
Fixes #3039: Fix exception when retrieving change object for a compon…
Browse files Browse the repository at this point in the history
…ent template via API
  • Loading branch information
jeremystretch committed Apr 4, 2019
1 parent 1e160fd commit 858be6d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ v2.5.10 (FUTURE)

## 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

---
Expand Down
14 changes: 10 additions & 4 deletions netbox/extras/api/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
from tenancy.models import Tenant, TenantGroup
from users.api.nested_serializers import NestedUserSerializer
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 *

Expand Down Expand Up @@ -235,9 +236,14 @@ def get_changed_object(self, obj):
"""
if obj.changed_object is 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
context = {'request': self.context['request']}
context = {
'request': self.context['request']
}
data = serializer(obj.changed_object, context=context).data

return data

0 comments on commit 858be6d

Please sign in to comment.