Changeset 7326 for django/trunk/tests/modeltests/model_forms

Timestamp:

03/19/08 18:10:45 (10 months ago)

Author:

jacob

Message:

Fixed #4620: you can now easily add custom labels to ModelChoiceFields? via subclassing. Thanks, PhiR.

Files:

• django/trunk/tests/modeltests/model_forms/models.py (modified) (2 diffs)

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

@@ -660 +660 @@
-ValidationError: [u'Select a valid choice. That choice is not one of the available choices.']
-
+# check that we can safely iterate choices repeatedly
+>>> gen_one = list(f.choices)
+>>> gen_two = f.choices
+>>> gen_one[2]
+(2L, u"It's a test")
+>>> list(gen_two)
+[(u'', u'---------'), (1L, u'Entertainment'), (2L, u"It's a test"), (3L, u'Third')]
+
+# check that we can override the label_from_instance method to print custom labels (#4620)
+>>> f.queryset = Category.objects.all()
+>>> f.label_from_instance = lambda obj: "category " + str(obj)
+>>> list(f.choices)
+[(u'', u'---------'), (1L, 'category Entertainment'), (2L, "category It's a test"), (3L, 'category Third'), (4L, 'category Fourth')]
-
-# ModelMultipleChoiceField ####################################################
@@ -745 +758 @@
-ValidationError: [u'Select a valid choice. 4 is not one of the available choices.']
-
+>>> f.queryset = Category.objects.all()
+>>> f.label_from_instance = lambda obj: "multicategory " + str(obj)
+>>> list(f.choices)
+[(1L, 'multicategory Entertainment'), (2L, "multicategory It's a test"), (3L, 'multicategory Third'), (4L, 'multicategory Fourth')]
-
-# PhoneNumberField ############################################################