Skip to content
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

Support source='some_method' for HyperlinkedRelatedField. #2690

Merged
merged 5 commits into from
Jul 27, 2015
Merged

Support source='some_method' for HyperlinkedRelatedField. #2690

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f53c6c7
Added a test to reproduce the issue
delinhabit Mar 13, 2015
46b65d1
Added another test case for PK relations
delinhabit Jul 25, 2015
47a22a5
Added a possible fix
delinhabit Jul 25, 2015
0386a01
Addressed CR comments
delinhabit Jul 27, 2015
d4353cc
Moved the code comment inside the if block and removed whitespace
delinhabit Jul 27, 2015
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
11 changes: 9 additions & 2 deletions rest_framework/relations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
from django.utils.translation import ugettext_lazy as _

from rest_framework.compat import OrderedDict
from rest_framework.fields import Field, empty, get_attribute
from rest_framework.fields import (
Field, empty, get_attribute, is_simple_callable
)
from rest_framework.reverse import reverse
from rest_framework.utils import html

Expand Down Expand Up @@ -106,7 +108,12 @@ def get_attribute(self, instance):
# Optimized case, return a mock object only containing the pk attribute.
try:
instance = get_attribute(instance, self.source_attrs[:-1])
return PKOnlyObject(pk=instance.serializable_value(self.source_attrs[-1]))
value = instance.serializable_value(self.source_attrs[-1])
if is_simple_callable(value):
# Handle edge case where the relationship `source` argument
# points to a `get_relationship()` method on the model
value = value().pk
return PKOnlyObject(pk=value)
except AttributeError:
pass

Expand Down