encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-30 18:09:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge cfd29875f1 into 33a26a76f1

Browse Source
This commit is contained in:
Andrea de Marco 2013-04-27 07:42:21 -07:00
commit 2249b64eea
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rest_framework/serializers.py
View File

@ -768,6 +768,7 @@ class HyperlinkedModelSerializerOptions(ModelSerializerOptions):
def __init__(self, meta): def __init__(self, meta):
super(HyperlinkedModelSerializerOptions, self).__init__(meta) super(HyperlinkedModelSerializerOptions, self).__init__(meta)
self.view_name = getattr(meta, 'view_name', None) self.view_name = getattr(meta, 'view_name', None)
self.include_pk = getattr(meta, 'include_pk', False)
class HyperlinkedModelSerializer(ModelSerializer): class HyperlinkedModelSerializer(ModelSerializer):
@ -797,7 +798,8 @@ class HyperlinkedModelSerializer(ModelSerializer):
return self._default_view_name % format_kwargs return self._default_view_name % format_kwargs
def get_pk_field(self, model_field): def get_pk_field(self, model_field):
return None if self.opts.include_pk:
return super(HyperlinkedModelSerializer, self).get_pk_field(model_field)
def get_related_field(self, model_field, to_many): def get_related_field(self, model_field, to_many):
""" """