aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/relations.py
diff options
context:
space:
mode:
authorTom Christie2013-05-31 11:50:37 +0100
committerTom Christie2013-05-31 11:50:37 +0100
commitd7753123f60c6e76c732e02b9caddd57b0683a5a (patch)
tree17d3086191c0d7ec1c494677bd1a2fce0b60d835 /rest_framework/relations.py
parentc36ff4e052f0a6a188100908b03d2c3328fd97bc (diff)
downloaddjango-rest-framework-d7753123f60c6e76c732e02b9caddd57b0683a5a.tar.bz2
HyperlinkedModelSerializer lookup_field option should apply to HyperlinkedIdentityField
Diffstat (limited to 'rest_framework/relations.py')
-rw-r--r--rest_framework/relations.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/rest_framework/relations.py b/rest_framework/relations.py
index 42abf3ca..4ecf795c 100644
--- a/rest_framework/relations.py
+++ b/rest_framework/relations.py
@@ -493,8 +493,9 @@ class HyperlinkedIdentityField(Field):
self.view_name = kwargs.pop('view_name', None)
# Optionally the format of the target hyperlink may be specified
self.format = kwargs.pop('format', None)
-
- self.lookup_field = kwargs.pop('lookup_field', self.lookup_field)
+ lookup_field = kwargs.pop('lookup_field', None)
+ if lookup_field is not None:
+ self.lookup_field = lookup_field
# These are pending deprecation
if 'pk_url_kwarg' in kwargs: