Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.5.x] Fixed #18172 -- Made models with __iter__ usable in ModelMult…

…ipleChoiceField

Thanks to Patryk Zawadzki for the patch.

Backpatch of 3989ce5
  • Loading branch information...
commit 9892919b0df0e7369ab793119342182cf91d549d 1 parent 470f3ec
@patrys patrys authored akaariai committed
View
4 django/forms/models.py
@@ -1033,6 +1033,8 @@ def clean(self, value):
return qs
def prepare_value(self, value):
- if hasattr(value, '__iter__') and not isinstance(value, six.text_type):
+ if (hasattr(value, '__iter__') and
+ not isinstance(value, six.text_type) and
+ not hasattr(value, '_meta')):
return [super(ModelMultipleChoiceField, self).prepare_value(v) for v in value]
return super(ModelMultipleChoiceField, self).prepare_value(value)
View
15 tests/modeltests/model_forms/models.py
@@ -263,3 +263,18 @@ class FlexibleDatePost(models.Model):
slug = models.CharField(max_length=50, unique_for_year='posted', blank=True)
subtitle = models.CharField(max_length=50, unique_for_month='posted', blank=True)
posted = models.DateField(blank=True, null=True)
+
+@python_2_unicode_compatible
+class Colour(models.Model):
+ name = models.CharField(max_length=50)
+
+ def __iter__(self):
+ for number in xrange(5):
+ yield number
+
+ def __str__(self):
+ return self.name
+
+class ColourfulItem(models.Model):
+ name = models.CharField(max_length=50)
+ colours = models.ManyToManyField(Colour)
View
16 tests/modeltests/model_forms/tests.py
@@ -19,7 +19,8 @@
Category, CommaSeparatedInteger, CustomFieldForExclusionModel, DerivedBook,
DerivedPost, ExplicitPK, FlexibleDatePost, ImprovedArticle,
ImprovedArticleWithParentLink, Inventory, Post, Price,
- Product, TextFile, Writer, WriterProfile, test_images)
+ Product, TextFile, Writer, WriterProfile, Colour, ColourfulItem,
+ test_images)
if test_images:
from .models import ImageFile, OptionalImageFile
@@ -174,6 +175,10 @@ class Meta:
model = Price
exclude = ('quantity',)
+class ColourfulItemForm(forms.ModelForm):
+ class Meta:
+ model = ColourfulItem
+
class ModelFormBaseTest(TestCase):
def test_base_form(self):
@@ -1515,3 +1520,12 @@ def test_model_field_that_returns_none_to_exclude_itself_with_explicit_fields(se
['name'])
self.assertHTMLEqual(six.text_type(CustomFieldForExclusionForm()),
'''<tr><th><label for="id_name">Name:</label></th><td><input id="id_name" type="text" name="name" maxlength="10" /></td></tr>''')
+
+ def test_iterable_model_m2m(self) :
+ colour = Colour.objects.create(name='Blue')
+ form = ColourfulItemForm()
+ self.maxDiff = 1024
+ self.assertHTMLEqual(form.as_p(), """<p><label for="id_name">Name:</label> <input id="id_name" type="text" name="name" maxlength="50" /></p>
+ <p><label for="id_colours">Colours:</label> <select multiple="multiple" name="colours" id="id_colours">
+ <option value="1">Blue</option>
+ </select> <span class="helptext"> Hold down "Control", or "Command" on a Mac, to select more than one.</span></p>""")
Please sign in to comment.
Something went wrong with that request. Please try again.