encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-04 20:40:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge fac579342d into 7fd4f7e2ff

Browse Source
This commit is contained in:
Jarrod Baumann 2014-11-05 08:56:33 +00:00
commit 869e8936c9
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rest_framework/relations.py
View File

@ -2,6 +2,7 @@ from rest_framework.compat import smart_text, urlparse
from rest_framework.fields import get_attribute, empty, Field from rest_framework.fields import get_attribute, empty, Field
from rest_framework.reverse import reverse from rest_framework.reverse import reverse
from rest_framework.utils import html from rest_framework.utils import html
from rest_framework.settings import api_settings
from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured
from django.core.urlresolvers import resolve, get_script_prefix, NoReverseMatch, Resolver404 from django.core.urlresolvers import resolve, get_script_prefix, NoReverseMatch, Resolver404
from django.db.models.query import QuerySet from django.db.models.query import QuerySet
@ -176,6 +177,10 @@ class HyperlinkedRelatedField(RelatedField):
return self.reverse(view_name, kwargs=kwargs, request=request, format=format) return self.reverse(view_name, kwargs=kwargs, request=request, format=format)
def to_internal_value(self, data): def to_internal_value(self, data):
if isinstance(data, dict) and api_settings.URL_FIELD_NAME in data:
# Accomodate passing the full resource instead of just the URL
data = data[api_settings.URL_FIELD_NAME]
try: try:
http_prefix = data.startswith(('http:', 'https:')) http_prefix = data.startswith(('http:', 'https:'))
except AttributeError: except AttributeError: