Skip to content

Fix None UUID ForeignKey serialization #3936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xordoquy merged 3 commits into from
Mar 22, 2016
Merged

Fix None UUID ForeignKey serialization #3936

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20d1fdb
Fix None UUID ForeignKey serialization
Feb 16, 2016
cbb8d8d
Test deserialising data including `None` fk
Feb 10, 2016
2ef74cf
Bring check for null fk to `BaseSerializer.to_representation`
carltongibson Mar 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Bring check for null fk to BaseSerializer.to_representation
  • Loading branch information
@carltongibson
carltongibson committed Mar 13, 2016
commit 2ef74cfa61d6f52a2a5c32151a052488d5d7e9e2
2 changes: 0 additions & 2 deletions rest_framework/fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,8 +778,6 @@ def to_internal_value(self, data):
return data

def to_representation(self, value):
if value is None:
return None
if self.uuid_format == 'hex_verbose':
return str(value)
else:
Expand Down
10 changes: 7 additions & 3 deletions rest_framework/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,9 +464,13 @@ def to_representation(self, instance):
except SkipField:
continue

if attribute is None:
# We skip `to_representation` for `None` values so that
# fields do not have to explicitly deal with that case.
# We skip `to_representation` for `None` values so that fields do
# not have to explicitly deal with that case.
#
# For related fields with `use_pk_only_optimization` we need to
# resolve the pk value.
check_for_none = attribute.pk if isinstance(attribute, PKOnlyObject) else attribute
if check_for_none is None:
ret[field.field_name] = None
else:
ret[field.field_name] = field.to_representation(attribute)
Expand Down