From 6b09e5f2bba9167404ec329fa12c7f0215ca51ac Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 8 Oct 2014 11:22:10 +0100
Subject: Tests for generic relationships

---
 rest_framework/relations.py   |  2 +-
 rest_framework/serializers.py | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'rest_framework')

diff --git a/rest_framework/relations.py b/rest_framework/relations.py
index e5bdf60c..df5025b8 100644
--- a/rest_framework/relations.py
+++ b/rest_framework/relations.py
@@ -49,7 +49,7 @@ class RelatedField(Field):
         ])
 
 
-class StringRelatedField(Field):
+class StringRelatedField(RelatedField):
     """
     A read only field that represents its targets using their
     plain string representation.
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index ed024f87..3d868a9e 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -520,11 +520,6 @@ class ModelSerializer(Serializer):
                 ret[field_name] = declared_fields[field_name]
                 continue
 
-            elif field_name == api_settings.URL_FIELD_NAME:
-                # Create the URL field.
-                field_cls = HyperlinkedIdentityField
-                kwargs = get_url_kwargs(model)
-
             elif field_name in info.fields_and_pk:
                 # Create regular model fields.
                 model_field = info.fields_and_pk[field_name]
@@ -561,6 +556,11 @@ class ModelSerializer(Serializer):
                 field_cls = ReadOnlyField
                 kwargs = {}
 
+            elif field_name == api_settings.URL_FIELD_NAME:
+                # Create the URL field.
+                field_cls = HyperlinkedIdentityField
+                kwargs = get_url_kwargs(model)
+
             else:
                 raise ImproperlyConfigured(
                     'Field name `%s` is not valid for model `%s`.' %
-- 
cgit v1.2.3