Changeset 8102

Timestamp:

07/27/08 02:22:39 (4 months ago)

Author:

russellm

Message:

Fixed #7913 -- Corrected backwards incompatible parts of [7977] when optgroup handling was added to field choices (Ticket #4412). Thanks to Michael Elsdorfer (miracle2k) for the report and patch.

Files:

• django/trunk/django/db/models/fields/__init__.py (modified) (5 diffs)
• django/trunk/tests/modeltests/choices/models.py (modified) (1 diff)
• django/trunk/tests/regressiontests/model_fields/models.py (modified) (2 diffs)

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

@@ -289 +289 @@
-            field_objs = [oldforms.SelectField]
-
-flatchoices
+get_flatchoices()
-        else:
-            field_objs = self.get_manipulator_field_objs()
@@ -363 +363 @@
-
-    def get_choices(self, include_blank=True, blank_choice=BLANK_CHOICE_DASH):
-
+
+
-        first_choice = include_blank and blank_choice or []
-        if self.choices:
@@ -377 +378 @@
-        return self.get_choices()
-
+    def get_flatchoices(self, include_blank=True, blank_choice=BLANK_CHOICE_DASH):
+        "Returns flattened choices with a default blank choice included."
+        first_choice = include_blank and blank_choice or []
+        return first_choices + list(self.flatchoices)
+
-    def _get_val_from_obj(self, obj):
-        if obj:
@@ -409 +415 @@
-
-    def _get_flatchoices(self):
+        """Flattened version of choices tuple."""
-        flat = []
-get_choices_default()
+choices
-            if type(value) in (list, tuple):
-                flat.extend(value)
@@ -417 +424 @@
-        return flat
-    flatchoices = property(_get_flatchoices)
-
+
-    def save_form_data(self, instance, data):
-        setattr(instance, self.name, data)

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

@@ -37 +37 @@
->>> s.get_gender_display()
-u'Female'
+
+# If the value for the field doesn't correspond to a valid choice,
+# the value itself is provided as a display value.
+>>> a.gender = ''
+>>> a.get_gender_display()
+u''
+
+>>> a.gender = 'U'
+>>> a.get_gender_display()
+u'U'
+
-"""}

django/trunk/tests/regressiontests/model_fields/models.py

@@ -12 +12 @@
-    a = models.ForeignKey(Foo, default=get_foo)
-
+class Whiz(models.Model):
+    CHOICES = (
+        ('Group 1', (
+                (1,'First'),
+                (2,'Second'),
+            )
+        ),
+        ('Group 2', (
+                (3,'Third'),
+                (4,'Fourth'),
+            )
+        ),        
+        (0,'Other'),
+    )
+    c = models.IntegerField(choices=CHOICES, null=True)
+    
-__test__ = {'API_TESTS':"""
-# Create a couple of Places.
@@ -22 +38 @@
->>> b.save()
-
+# Regression tests for #7913
+# Check that get_choices and get_flatchoices interact with
+# get_FIELD_display to return the expected values.
+
+# Test a nested value
+>>> w = Whiz(c=1)
+>>> w.save()
+>>> w.get_c_display()
+u'First'
+
+# Test a top level value
+>>> w.c = 0
+>>> w.save()
+>>> w.get_c_display()
+u'Other'
+
+# Test an invalid data value
+>>> w.c = 9
+>>> w.save()
+>>> w.get_c_display()
+9
+
+# Test a blank data value
+>>> w.c = None
+>>> w.save()
+>>> print w.get_c_display()
+None
+
+# Test an empty data value
+>>> w.c = ''
+>>> w.save()
+>>> w.get_c_display()
+u''
+
+
-"""}