Ticket #4412: 4412-r7000.diff

django/db/models/base.py

@@ -335 +335 @@
-
-    def _get_FIELD_display(self, field):
-        value = getattr(self, field.attname)
-
+
+
+
+
+
+
+
-
-    def _get_next_or_previous_by_FIELD(self, field, is_next, **kwargs):
-        qn = connection.ops.quote_name

django/newforms/fields.py

@@ -582 +582 @@
-        value = smart_unicode(value)
-        if value == u'':
-            return value
-
+
+
+
+
+
+
+
-        if value not in valid_values:
-            raise ValidationError(self.error_messages['invalid_choice'] % {'value': value})
-        return value
@@ -607 +613 @@
-            raise ValidationError(self.error_messages['invalid_list'])
-        new_value = [smart_unicode(val) for val in value]
-        # Validate that each value in the value list is in self.choices.
-
+
+
+
+
+
+
+
-        for val in new_value:
-            if val not in valid_values:
-                raise ValidationError(self.error_messages['invalid_choice'] % {'value': val})

django/newforms/widgets.py

@@ -215 +215 @@
-        # Normalize to string.
-        str_value = force_unicode(value)
-        for option_value, option_label in chain(self.choices, choices):
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    escape(option_value), selected_html,
-                    conditional_escape(force_unicode(option_label))))
-        output.append(u'</select>')

tests/regressiontests/forms/widgets.py

@@ -419 +419 @@
-<option value="4">4</option>
-</select>
-
+Choices can be nested one level in order to create HTML optgroups:
+>>> w = Select(choices=(('outer1', 'Outer 1'), ('Group 1', (('inner1', 'Inner 1'), ('inner2', 'Inner 2')))))
+>>> print w.render('nestchoice', None)
+<select name="nestchoice">
+<option value="outer1">Outer 1</option>
+<optgroup label="Group 1">
+<option value="inner1">Inner 1</option>
+<option value="inner2">Inner 2</option>
+</optgroup>
+</select>
+>>> print w.render('nestchoice', 'outer1')
+<select name="nestchoice">
+<option value="outer1" selected="selected">Outer 1</option>
+<optgroup label="Group 1">
+<option value="inner1">Inner 1</option>
+<option value="inner2">Inner 2</option>
+</optgroup>
+</select>
+>>> print w.render('nestchoice', 'inner1')
+<select name="nestchoice">
+<option value="outer1">Outer 1</option>
+<optgroup label="Group 1">
+<option value="inner1" selected="selected">Inner 1</option>
+<option value="inner2">Inner 2</option>
+</optgroup>
+</select>
+
-# NullBooleanSelect Widget ####################################################
-
->>> w = NullBooleanSelect()

docs/newforms.txt

@@ -1229 +1229 @@
-    * Error message keys: ``required``, ``invalid_choice``
-
-Takes one extra argument, ``choices``, which is an iterable (e.g., a list or
-
+
+
+
-
+.. _model API documentation on choices: ../model-api#choices
+
-``DateField``
-~~~~~~~~~~~~~
-

docs/model-api.txt

@@ -568 +568 @@
-    class Foo(models.Model):
-        gender = models.CharField(max_length=1, choices=GENDER_CHOICES)
-
+You can also collect your available choices into named groups, which will
+be used for display purposes::
+
+    MEDIA_CHOICES = (
+        ('Audio', (
+                ('vinyl', 'Vinyl'),
+                ('cd', 'CD'),
+            )
+        ),
+        ('Video', (
+                ('vhs', 'VHS Tape'),
+                ('dvd', 'DVD'),
+            )
+        ),
+        ('unknown', 'Unknown'),
+    )
+
+The first element in each tuple is the name to apply to the group. The 
+second element is an iterable of 2-tuples, with each 2-tuple containing
+a value and a human-readable name for an option. Grouped options may be 
+combined with ungrouped options within a single list (such as the 
+`unknown` option in this example).
+
-For each model field that has ``choices`` set, Django will add a method to
-retrieve the human-readable name for the field's current value. See
-`get_FOO_display`_ in the database API documentation.