Changeset 6733

Timestamp:

11/29/07 10:32:18 (7 months ago)

Author:

mtredinnick

Message:

Fixed #4653 -- Improved the logic to decide when to include (and select as
initial value) the blank choice for a model field with choices. Thanks to
Ilya Semenov for persisting with this.

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/django/db/models/fields/__init__.py (modified) (1 diff)
• django/trunk/docs/newforms.txt (modified) (2 diffs)
• django/trunk/tests/modeltests/model_forms/models.py (modified) (3 diffs)

django/trunk/AUTHORS

@@ -274 +274 @@
-    David Schein
-    scott@staplefish.com
+    Ilya Semenov <semenov@inetss.com>
-    serbaut@gmail.com
-    John Shaffer <jshaffer2112@gmail.com>

django/trunk/django/db/models/fields/__init__.py

@@ -393 +393 @@
-        defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text}
-        if self.choices:
-
+include_blank=self.blank or not (self.has_default() or 'initial' in kwargs)
-        if self.has_default():
-            defaults['initial'] = self.get_default()

django/trunk/docs/newforms.txt

@@ -1850 +1850 @@
-    * If the model field has ``choices`` set, then the form field's ``widget``
-      will be set to ``Select``, with choices coming from the model field's
-
+
+
+
+
+
-
-Finally, note that you can override the form field used for a given model
@@ -2096 +2100 @@
-    >>> f = AuthorForm()
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-When you call ``save()`` on a form created by ``form_for_instance()``,

django/trunk/tests/modeltests/model_forms/models.py

@@ -29 +29 @@
-    (2, 'Pending'),
-    (3, 'Live'),
+)
+
+STEERING_TYPE = (
+    ('left', 'Left steering wheel'),
+    ('right', 'Right steering wheel'),
+)
+
+FUEL_TYPE = (
+    ('gas', 'Gasoline'),
+    ('diesel', 'Diesel'),
+    ('other', 'Other'),
+)
+
+TRANSMISSION_TYPE = (
+    ('at', 'Automatic'),
+    ('mt', 'Manual'),
+    ('cvt', 'CVT'),
-)
-
@@ -70 +87 @@
-    def __unicode__(self):
-        return self.phone
+
+class Car(models.Model):
+    name = models.CharField(max_length=50)
+    steering = models.CharField(max_length=5, choices=STEERING_TYPE, default='left')
+    fuel = models.CharField(max_length=10, choices=FUEL_TYPE)
+    transmission = models.CharField(max_length=3, choices=TRANSMISSION_TYPE, blank=True, help_text='Leave empty if not applicable.')
-
-__test__ = {'API_TESTS': """
@@ -593 +616 @@
->>> f.cleaned_data
-{'phone': u'312-555-1212', 'description': u'Assistance'}
+
+# form_for_* blank choices ####################################################
+
+Show the form for a new Car. Note that steering field doesn't include the blank choice,
+because the field is obligatory and has an explicit default.
+>>> CarForm = form_for_model(Car)
+>>> f = CarForm(auto_id=False)
+>>> print f
+<tr><th>Name:</th><td><input type="text" name="name" maxlength="50" /></td></tr>
+<tr><th>Steering:</th><td><select name="steering">
+<option value="left" selected="selected">Left steering wheel</option>
+<option value="right">Right steering wheel</option>
+</select></td></tr>
+<tr><th>Fuel:</th><td><select name="fuel">
+<option value="" selected="selected">---------</option>
+<option value="gas">Gasoline</option>
+<option value="diesel">Diesel</option>
+<option value="other">Other</option>
+</select></td></tr>
+<tr><th>Transmission:</th><td><select name="transmission">
+<option value="" selected="selected">---------</option>
+<option value="at">Automatic</option>
+<option value="mt">Manual</option>
+<option value="cvt">CVT</option>
+</select><br />Leave empty if not applicable.</td></tr>
+
+Create a Car, and display the form for modifying it. Note that now the fuel
+selector doesn't include the blank choice as well, since the field is
+obligatory and can not be changed to be blank.
+>>> honda = Car(name='Honda Accord Wagon', steering='right', fuel='gas', transmission='at')
+>>> honda.save()
+>>> HondaForm = form_for_instance(honda)
+>>> f = HondaForm(auto_id=False)
+>>> print f
+<tr><th>Name:</th><td><input type="text" name="name" value="Honda Accord Wagon" maxlength="50" /></td></tr>
+<tr><th>Steering:</th><td><select name="steering">
+<option value="left">Left steering wheel</option>
+<option value="right" selected="selected">Right steering wheel</option>
+</select></td></tr>
+<tr><th>Fuel:</th><td><select name="fuel">
+<option value="gas" selected="selected">Gasoline</option>
+<option value="diesel">Diesel</option>
+<option value="other">Other</option>
+</select></td></tr>
+<tr><th>Transmission:</th><td><select name="transmission">
+<option value="">---------</option>
+<option value="at" selected="selected">Automatic</option>
+<option value="mt">Manual</option>
+<option value="cvt">CVT</option>
+</select><br />Leave empty if not applicable.</td></tr>
-"""}