encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-07 13:54:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 5b5a95a413 into 7ab4a587d9

Browse Source
This commit is contained in:
S.Mohammad Emami Razavi 2016-09-21 11:28:56 +00:00 committed by GitHub
commit b6daf5112c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rest_framework/relations.py
View File

@ -7,7 +7,7 @@ from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist
from django.core.urlresolvers import (
NoReverseMatch, Resolver404, get_script_prefix, resolve
)
from django.db.models import Manager
from django.db.models import Manager, Model
from django.db.models.query import QuerySet
from django.utils import six
from django.utils.encoding import python_2_unicode_compatible, smart_text
@ -226,6 +226,8 @@ class PrimaryKeyRelatedField(RelatedField):
return True
def to_internal_value(self, data):
if isinstance(data, Model):
return data
if self.pk_field is not None:
data = self.pk_field.to_internal_value(data)
try: