Ticket #3652: 4664-choicefield.patch

django/db/models/fields/__init__.py

@@ -425 +425 @@
     def formfield(self, **kwargs):
         defaults = {'max_length': self.maxlength, 'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text}
         defaults.update(kwargs)
-        return forms.CharField(**defaults)
+        if not self.choices:
+            return forms.CharField(**defaults)
+        else:
+            defaults.update(choices=self.choices)
+            return forms.ChoiceField(**defaults)
 
+
 # TODO: Maybe move this into contrib, because it's specialized.
 class CommaSeparatedIntegerField(CharField):
     def get_manipulator_field_objs(self):
@@ -724 +729 @@
     def formfield(self, **kwargs):
         defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text}
         defaults.update(kwargs)
-        return forms.IntegerField(**defaults)
+        if not self.choices:
+            return forms.IntegerField(**defaults)
+        else:
+            defaults.update(choices=self.choices)
+            return forms.ChoiceField(**defaults)
 
 class IPAddressField(Field):
     def __init__(self, *args, **kwargs):

django/newforms/fields.py

@@ -332 +332 @@
 class ChoiceField(Field):
     def __init__(self, choices=(), required=True, widget=Select, label=None, initial=None, help_text=None):
         super(ChoiceField, self).__init__(required, widget, label, initial, help_text)
-        self.choices = choices
+        self.choices = not required and [[u'', u'---------']] + list(choices) or choices
 
     def _get_choices(self):
         return self._choices
@@ -354 +354 @@
             value = u''
         value = smart_unicode(value)
         if value == u'':
-            return value
+            return None 
         valid_values = set([str(k) for k, v in self.choices])
         if value not in valid_values:
             raise ValidationError(gettext(u'Select a valid choice. That choice is not one of the available choices.'))

tests/modeltests/model_forms/models.py

@@ -61 +61 @@
     def __str__(self):
         return self.phone
 
+class Todo(models.Model):
+    what = models.CharField(maxlength=100)
+    importance = models.IntegerField(choices=((1, 'Extremely important'), (2,'Floss cat first')), blank=True, null=True)
+
 __test__ = {'API_TESTS': """
 >>> from django.newforms import form_for_model, form_for_instance, save_instance, BaseForm, Form, CharField
 >>> import datetime
@@ -461 +465 @@
 True
 >>> f.clean_data
 {'phone': u'312-555-1212', 'description': u'Assistance'}
+
+# ChoiceField ############################################################
+
+>>> ChoiceForm = form_for_model(Todo)
+>>> f = ChoiceForm()
+>>> print f.as_ul()
+<li><label for="id_what">What:</label> <input id="id_what" type="text" name="what" maxlength="100" /></li>
+<li><label for="id_importance">Importance:</label> <select name="importance" id="id_importance">
+<option value="" selected="selected">---------</option>
+<option value="1">Extremely important</option>
+<option value="2">Floss cat first</option>
+</select></li>
+>>> f = ChoiceForm({'what': 'floss cat', 'importance': ''})
+>>> f.is_valid()
+True
+>>> f.save()
+<Todo: Todo object>
 """}