Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion rest_framework/relations.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ def get_attribute(self, instance):
pass

# Standard case, return the object instance.
return get_attribute(instance, self.source_attrs)
return super(RelatedField, self).get_attribute(instance)

def get_choices(self, cutoff=None):
queryset = self.get_queryset()
Expand Down
21 changes: 21 additions & 0 deletions tests/test_model_serializer.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
from rest_framework import serializers
from rest_framework.compat import postgres_fields, unicode_repr

from .models import NestedForeignKeySource


def dedent(blocktext):
return '\n'.join([line[12:] for line in blocktext.splitlines()[1:-1]])
Expand Down Expand Up @@ -1164,6 +1166,25 @@ class Meta:


class TestFieldSource(TestCase):
def test_traverse_nullable_fk(self):
"""
A dotted source with nullable elements uses default when any item in the chain is None. #5849.

Similar to model example from test_serializer.py `test_default_for_multiple_dotted_source` method,
but using RelatedField, rather than CharField.
"""
class TestSerializer(serializers.ModelSerializer):
target = serializers.PrimaryKeyRelatedField(
source='target.target', read_only=True, allow_null=True, default=None
)

class Meta:
model = NestedForeignKeySource
fields = ('target', )

model = NestedForeignKeySource.objects.create()
assert TestSerializer(model).data['target'] is None

def test_named_field_source(self):
class TestSerializer(serializers.ModelSerializer):

Expand Down