summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorHonza Král <Honza.Kral@gmail.com>2013-02-23 06:55:09 -0800
committerHonza Král <Honza.Kral@gmail.com>2013-02-23 06:55:09 -0800
commit6cb6e1128f090d5edde9918ba2ae79c1e38b65ad (patch)
tree3884b2e022797f8ab201ae119e13323e1f95bf30 /django
parent722683f508566cf06bcc85f9f1810c3cde80344c (diff)
parent3dddbc0f2380d2654e66c8df4bb40d5e1d42af98 (diff)
Merge pull request #769 from oinopion/ticket19816
Fixed #19816 -- pre-evaluate queryset on m2m set
Diffstat (limited to 'django')
-rw-r--r--django/db/models/fields/related.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py
index bea88ba337..01b8a550d1 100644
--- a/django/db/models/fields/related.py
+++ b/django/db/models/fields/related.py
@@ -904,6 +904,9 @@ class ReverseManyRelatedObjectsDescriptor(object):
raise AttributeError("Cannot set values on a ManyToManyField which specifies an intermediary model. Use %s.%s's Manager instead." % (opts.app_label, opts.object_name))
manager = self.__get__(instance)
+ # clear() can change expected output of 'value' queryset, we force evaluation
+ # of queryset before clear; ticket #19816
+ value = tuple(value)
manager.clear()
manager.add(*value)