Ticket #11183: 11183.2.diff

django/forms/models.py

@@ -923 +923 @@
         self.choice_cache = None
         self.to_field_name = to_field_name
 
+    def __deepcopy__(self, memo):
+        result = super(ChoiceField, self).__deepcopy__(memo)
+        # Need to force a new ModelChoiceIterator to be created, bug #11183
+        result.queryset = result.queryset
+        return result
+
     def _get_queryset(self):
         return self._queryset
 

tests/regressiontests/model_forms_regress/tests.py

@@ -2 +2 @@
 
 from django import db
 from django import forms
-from django.forms.models import modelform_factory
+from django.forms.models import modelform_factory, ModelChoiceField
 from django.conf import settings
 from django.test import TestCase
 
@@ -203 +203 @@
         form = AuthorForm({'publication':u'', 'full_name':'John Doe'}, instance=author)
         self.assert_(not form.is_valid())
 
+
+class ModelChoiceForm1(forms.Form):
+    person = ModelChoiceField(Person.objects.all())
+
+
+class TestTicket11183(TestCase):
+    def test_11183(self):
+        form1 = ModelChoiceForm1()
+        field1 = form1.fields['person']
+        self.assert_(field1 is not ModelChoiceForm1.base_fields['person']) # sanity check
+        # To allow us to change the queryset of field1.widget.choices correctly, 
+        # without affecting other forms, the following must hold:
+        self.assert_(field1.widget.choices.field is not ModelChoiceForm1.base_fields['person'])