From d7753123f60c6e76c732e02b9caddd57b0683a5a Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 31 May 2013 11:50:37 +0100
Subject: HyperlinkedModelSerializer lookup_field option should apply to
 HyperlinkedIdentityField

---
 rest_framework/relations.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'rest_framework/relations.py')

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:
-- 
cgit v1.2.3