aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework
diff options
context:
space:
mode:
authorTom Christie2014-09-12 21:32:20 +0100
committerTom Christie2014-09-12 21:32:20 +0100
commitafb28a44ad1737cd6fcd6da50ba9552f38293368 (patch)
treea6bb5fbe119d1a834957f4c8758abb1aa5f34724 /rest_framework
parent4fceceae7d1abf4d841677daee2636273ff09de8 (diff)
downloaddjango-rest-framework-afb28a44ad1737cd6fcd6da50ba9552f38293368.tar.bz2
Dealing with reverse relationships
Diffstat (limited to 'rest_framework')
-rw-r--r--rest_framework/serializers.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 0c2aedfa..ecb2829b 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -157,7 +157,7 @@ class Serializer(BaseSerializer):
def __init__(self, *args, **kwargs):
self.context = kwargs.pop('context', {})
kwargs.pop('partial', None)
- kwargs.pop('many', False)
+ kwargs.pop('many', None)
super(Serializer, self).__init__(*args, **kwargs)
@@ -423,9 +423,9 @@ class ModelSerializer(Serializer):
for accessor_name, relation_info in info.reverse_relations.items():
if accessor_name in self.opts.fields:
if self.opts.depth:
- ret[field_name] = self.get_nested_field(*relation_info)
+ ret[accessor_name] = self.get_nested_field(*relation_info)
else:
- ret[field_name] = self.get_related_field(*relation_info)
+ ret[accessor_name] = self.get_related_field(*relation_info)
return ret
@@ -444,7 +444,7 @@ class ModelSerializer(Serializer):
Note that model_field will be `None` for reverse relationships.
"""
- class NestedModelSerializer(ModelSerializer):
+ class NestedModelSerializer(ModelSerializer): # Not right!
class Meta:
model = related_model
depth = self.opts.depth - 1