From 743224d000bbc178dafcff1e9315f1d74bee44de Mon Sep 17 00:00:00 2001 From: Tomi Pajunen Date: Thu, 8 Nov 2012 16:31:16 +0200 Subject: [PATCH 1/3] Fixed creation of objects with reversed M2M relations --- rest_framework/serializers.py | 7 +++++++ rest_framework/tests/pk_relations.py | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 4f68ada68..e45016799 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -447,6 +447,13 @@ class ModelSerializer(Serializer): setattr(instance, key, val) return instance + # Reversed relation + for (obj, model) in self.opts.model._meta.get_all_related_m2m_objects_with_model(): + field_name = obj.field.related_query_name() + if field_name in attrs: + self.m2m_data[field_name] = attrs.pop(field_name) + + # Forward relation for field in self.opts.model._meta.many_to_many: if field.name in attrs: self.m2m_data[field.name] = attrs.pop(field.name) diff --git a/rest_framework/tests/pk_relations.py b/rest_framework/tests/pk_relations.py index 947098107..44ae40409 100644 --- a/rest_framework/tests/pk_relations.py +++ b/rest_framework/tests/pk_relations.py @@ -117,6 +117,24 @@ class PrimaryKeyManyToManyTests(TestCase): ] self.assertEquals(serializer.data, expected) + def test_reverse_many_to_many_create(self): + data = {'id': 4, 'name': u'target-4', 'sources': [1, 3]} + serializer = ManyToManyTargetSerializer(data=data) + self.assertTrue(serializer.is_valid()) + obj = serializer.save() + self.assertEquals(serializer.data, data) + self.assertEqual(obj.name, u'target-4') + + # Ensure target 4 is added, and everything else is as expected + queryset = ManyToManyTarget.objects.all() + serializer = ManyToManyTargetSerializer(queryset) + expected = [ + {'id': 1, 'name': u'target-1', 'sources': [1, 2, 3]}, + {'id': 2, 'name': u'target-2', 'sources': [2, 3]}, + {'id': 3, 'name': u'target-3', 'sources': [3]}, + {'id': 4, 'name': u'target-4', 'sources': [1, 3]} + ] + self.assertEquals(serializer.data, expected) class PrimaryKeyForeignKeyTests(TestCase): def setUp(self): From b607eefc7c0e792c2e6d974c82912b930dd957fa Mon Sep 17 00:00:00 2001 From: Tomi Pajunen Date: Thu, 8 Nov 2012 16:48:16 +0200 Subject: [PATCH 2/3] Release notes updated --- docs/topics/release-notes.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index ecb6c91a2..302ad8b39 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -4,6 +4,10 @@ > > — Eric S. Raymond, [The Cathedral and the Bazaar][cite]. +## Master + +* Bugfix: Cannot create objects with reversed M2M relations + ## 2.1.1 **Date**: 7th Nov 2012 @@ -154,4 +158,4 @@ [cite]: http://www.catb.org/~esr/writings/cathedral-bazaar/cathedral-bazaar/ar01s04.html [2.1.0-notes]: https://groups.google.com/d/topic/django-rest-framework/Vv2M0CMY9bg/discussion -[announcement]: rest-framework-2-announcement.md \ No newline at end of file +[announcement]: rest-framework-2-announcement.md From 40c6fe7119e724d86f40b202c0dd579ad7ce8c7e Mon Sep 17 00:00:00 2001 From: Tomi Pajunen Date: Thu, 8 Nov 2012 17:04:29 +0200 Subject: [PATCH 3/3] Comments updated --- docs/topics/release-notes.md | 2 +- rest_framework/serializers.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 302ad8b39..47252b652 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -6,7 +6,7 @@ ## Master -* Bugfix: Cannot create objects with reversed M2M relations +* Bugfix: Cannot create objects with reverse M2M relations ## 2.1.1 diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index e45016799..95145d580 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -447,13 +447,13 @@ class ModelSerializer(Serializer): setattr(instance, key, val) return instance - # Reversed relation + # Reverse relations for (obj, model) in self.opts.model._meta.get_all_related_m2m_objects_with_model(): field_name = obj.field.related_query_name() if field_name in attrs: self.m2m_data[field_name] = attrs.pop(field_name) - # Forward relation + # Forward relations for field in self.opts.model._meta.many_to_many: if field.name in attrs: self.m2m_data[field.name] = attrs.pop(field.name)