Tests for generic relationships

1 files changed, 5 insertions, 5 deletions

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`.' %