Ticket #10366: T10366.diff

db/models/fields/__init__.py

@@ -63 +63 @@
             max_length=None, unique=False, blank=False, null=False,
             db_index=False, rel=None, default=NOT_PROVIDED, editable=True,
             serialize=True, unique_for_date=None, unique_for_month=None,
-            unique_for_year=None, choices=None, help_text='', db_column=None,
+            unique_for_year=None, choices=None, multi_choices=None, help_text='', db_column=None,
             db_tablespace=None, auto_created=False):
+        self.multi_choices = multi_choices
         self.name = name
         self.verbose_name = verbose_name
         self.primary_key = primary_key
@@ -315 +316 @@
             defaults['coerce'] = self.to_python
             if self.null:
                 defaults['empty_value'] = None
-            form_class = forms.TypedChoiceField
+            if self.multi_choices:
+                form_class = forms.MultipleChoiceField
+            else:
+                form_class = forms.TypedChoiceField
             # Many of the subclass-specific formfield arguments (min_value,
             # max_value) don't apply for choice fields, so be sure to only pass
             # the values that TypedChoiceField will understand.