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

Include fields from reversed relations fixes #569

Browse Source
This commit is contained in:
eofs 2013-01-10 12:10:35 +02:00
parent cb235977f6
commit de3400f608
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rest_framework/serializers.py
View File

@ -92,7 +92,6 @@ class SerializerOptions(object):
self.fields = getattr(meta, 'fields', ()) self.fields = getattr(meta, 'fields', ())
self.exclude = getattr(meta, 'exclude', ()) self.exclude = getattr(meta, 'exclude', ())
class BaseSerializer(Field): class BaseSerializer(Field):
class Meta(object): class Meta(object):
pass pass
@ -361,6 +360,7 @@ class ModelSerializerOptions(SerializerOptions):
super(ModelSerializerOptions, self).__init__(meta) super(ModelSerializerOptions, self).__init__(meta)
self.model = getattr(meta, 'model', None) self.model = getattr(meta, 'model', None)
self.read_only_fields = getattr(meta, 'read_only_fields', ()) self.read_only_fields = getattr(meta, 'read_only_fields', ())
self.include_reversed_relations = getattr(meta, 'include_reversed_relations', False)
class ModelSerializer(Serializer): class ModelSerializer(Serializer):
@ -383,6 +383,12 @@ class ModelSerializer(Serializer):
fields += [field for field in opts.fields if field.serialize] fields += [field for field in opts.fields if field.serialize]
fields += [field for field in opts.many_to_many if field.serialize] fields += [field for field in opts.many_to_many if field.serialize]
reversed_fields = ()
if self.opts.include_reversed_relations:
reversed_fields = [obj.field for obj in opts.get_all_related_objects() if obj.field.serialize]
reversed_fields = [obj.field for obj in opts.get_all_related_many_to_many_objects() if obj.field.serialize]
fields += reversed_fields
ret = SortedDict() ret = SortedDict()
nested = bool(self.opts.depth) nested = bool(self.opts.depth)
is_pk = True # First field in the list is the pk is_pk = True # First field in the list is the pk
@ -401,6 +407,9 @@ class ModelSerializer(Serializer):
field = self.get_field(model_field) field = self.get_field(model_field)
if field: if field:
if model_field in reversed_fields:
ret[model_field.rel.related_name] = field
else:
ret[model_field.name] = field ret[model_field.name] = field
for field_name in self.opts.read_only_fields: for field_name in self.opts.read_only_fields:
@ -421,9 +430,12 @@ class ModelSerializer(Serializer):
""" """
Creates a default instance of a nested relational field. Creates a default instance of a nested relational field.
""" """
# If field is reversed relation, get model from relation
obj_model = model_field.rel.to if self.opts.model is not model_field.rel.to else model_field.model
class NestedModelSerializer(ModelSerializer): class NestedModelSerializer(ModelSerializer):
class Meta: class Meta:
model = model_field.rel.to model = obj_model
return NestedModelSerializer() return NestedModelSerializer()
def get_related_field(self, model_field, to_many=False): def get_related_field(self, model_field, to_many=False):