diff --git a/django/forms/models.py b/django/forms/models.py index 1cbfba9602..1b2bf372c5 100644 --- a/django/forms/models.py +++ b/django/forms/models.py @@ -952,6 +952,12 @@ class ModelChoiceField(ChoiceField): 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 diff --git a/tests/regressiontests/model_forms_regress/tests.py b/tests/regressiontests/model_forms_regress/tests.py index 862c39c8d4..fb6bf3ff90 100644 --- a/tests/regressiontests/model_forms_regress/tests.py +++ b/tests/regressiontests/model_forms_regress/tests.py @@ -2,7 +2,7 @@ from datetime import date 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 @@ -107,3 +107,17 @@ class ModelClassTests(TestCase): class NoModelModelForm(forms.ModelForm): pass self.assertRaises(ValueError, NoModelModelForm) + + +class ModelChoiceForm(forms.Form): + person = ModelChoiceField(Person.objects.all()) + + +class TestTicket11183(TestCase): + def test_11183(self): + form1 = ModelChoiceForm() + field1 = form1.fields['person'] + # To allow the widget to change the queryset of field1.widget.choices correctly, + # without affecting other forms, the following must hold: + self.assert_(field1 is not ModelChoiceForm.base_fields['person']) + self.assert_(field1.widget.choices.field is field1)