Ticket #2037: 2037_2.diff

django/db/models/fields/__init__.py

@@ -294 +294 @@
 
     def get_choices(self, include_blank=True, blank_choice=BLANK_CHOICE_DASH):
         "Returns a list of tuples used as SelectField choices for this field."
-        first_choice = include_blank and blank_choice or []
+        first_choice = include_blank and (self.blank or self.null) and blank_choice or []
         if self.choices:
             return first_choice + list(self.choices)
         rel_model = self.rel.to

tests/modeltests/choices/models.py

@@ -23 +23 @@
     def __str__(self):
         return self.name
 
+CHOICES = (
+    (0, 'State A'),
+    (1, 'State B'),
+)
+
+class ChoiceableModel(models.Model):
+    emptynotallowed = models.CharField(maxlength=1, choices=CHOICES)
+    emptyallowed = models.CharField(maxlength=1, choices=CHOICES, null=True, blank=True)
+    defaultemptynotallowed = models.CharField(maxlength=1, choices=CHOICES, default=2)
+    defaultemptyallowed = models.CharField(maxlength=1, choices=CHOICES, null=True, blank=True, default=2)
+    nullrelation = models.ForeignKey(Person, null=True)
+    relation = models.ForeignKey(Person, related_name='notnulrelation')
+
 __test__ = {'API_TESTS':"""
 >>> a = Person(name='Adrian', gender='M')
 >>> a.save()
@@ -36 +49 @@
 'Male'
 >>> s.get_gender_display()
 'Female'
+>>> ChoiceableModel._meta.fields[1].get_choices()
+[(0, 'State A'), (1, 'State B')]
+>>> ChoiceableModel._meta.fields[2].get_choices()
+[('', '---------'), (0, 'State A'), (1, 'State B')]
+>>> ChoiceableModel._meta.fields[3].get_choices()
+[(0, 'State A'), (1, 'State B')]
+>>> ChoiceableModel._meta.fields[4].get_choices()
+[('', '---------'), (0, 'State A'), (1, 'State B')]
+>>> ChoiceableModel._meta.fields[5].get_choices()
+[('', '---------'), (1, 'Adrian'), (2, 'Sara')]
+>>> ChoiceableModel._meta.fields[6].get_choices()
+[(1, 'Adrian'), (2, 'Sara')]
 """}

tests/modeltests/manipulators/models.py

@@ -54 +54 @@
 
 # Attempt to create an Album with an invalid musician.
 >>> man.get_validation_errors(MultiValueDict({'name': ['Sallies Fforth'], 'musician': ['foo']}))
-{'musician': ["Select a valid choice; 'foo' is not in ['', '1']."]}
+{'musician': ["Select a valid choice; 'foo' is not in ['1']."]}
 
 # Attempt to create an Album with an invalid release_date.
 >>> man.get_validation_errors(MultiValueDict({'name': ['Sallies Fforth'], 'musician': ['1'], 'release_date': 'today'}))