diff options
| author | S.Prymak | 2014-01-14 10:38:49 +0200 |
|---|---|---|
| committer | S.Prymak | 2014-01-14 10:38:49 +0200 |
| commit | e9b0d70f5d8eb94d72da677846d5dab5b587e945 (patch) | |
| tree | 6815f5feb0765c9a3ba01820b3631802ef40f0f1 /rest_framework | |
| parent | 65858428fd7498c1783af0ec13de51521fe29c63 (diff) | |
| download | django-rest-framework-e9b0d70f5d8eb94d72da677846d5dab5b587e945.tar.bz2 | |
Override HyperlinkedModelSerializerOptions url field name with URL_FIELD_NAME setting
Diffstat (limited to 'rest_framework')
| -rw-r--r-- | rest_framework/serializers.py | 4 | ||||
| -rw-r--r-- | rest_framework/settings.py | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 0b5c6a05..73c407c7 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -20,6 +20,8 @@ from django.db import models from django.forms import widgets from django.utils.datastructures import SortedDict from rest_framework.compat import get_concrete_model, six +from rest_framework.settings import api_settings + # Note: We do the following so that users of the framework can use this style: # @@ -990,7 +992,7 @@ class HyperlinkedModelSerializerOptions(ModelSerializerOptions): super(HyperlinkedModelSerializerOptions, self).__init__(meta) self.view_name = getattr(meta, 'view_name', None) self.lookup_field = getattr(meta, 'lookup_field', None) - self.url_field_name = getattr(meta, 'url_field_name', 'url') + self.url_field_name = getattr(meta, 'url_field_name', api_settings.URL_FIELD_NAME) class HyperlinkedModelSerializer(ModelSerializer): diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 8abaf140..ce171d6d 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -95,6 +95,7 @@ DEFAULTS = { 'URL_FORMAT_OVERRIDE': 'format', 'FORMAT_SUFFIX_KWARG': 'format', + 'URL_FIELD_NAME': 'url', # Input and output formats 'DATE_INPUT_FORMATS': ( |
