From 791ecb4be4d64618a40e1a80fad26a5e3b4d4b90 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Sat, 19 Feb 2011 11:48:42 +0000 Subject: Fixed #13126 -- Ensured that individual form errors are displayed when errors occur on a list-editable changelist. Thanks to slafs for the report, and to Julien Phalip for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15580 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/admin_views/models.py | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) (limited to 'tests/regressiontests/admin_views/models.py') diff --git a/tests/regressiontests/admin_views/models.py b/tests/regressiontests/admin_views/models.py index 60319eaf7d..b601267e57 100644 --- a/tests/regressiontests/admin_views/models.py +++ b/tests/regressiontests/admin_views/models.py @@ -669,7 +669,32 @@ class Answer(models.Model): class Reservation(models.Model): start_date = models.DateTimeField() price = models.IntegerField() - + + +DRIVER_CHOICES = ( + (u'bill', 'Bill G'), + (u'steve', 'Steve J'), +) + +RESTAURANT_CHOICES = ( + (u'indian', u'A Taste of India'), + (u'thai', u'Thai Pography'), + (u'pizza', u'Pizza Mama'), +) + +class FoodDelivery(models.Model): + reference = models.CharField(max_length=100) + driver = models.CharField(max_length=100, choices=DRIVER_CHOICES, blank=True) + restaurant = models.CharField(max_length=100, choices=RESTAURANT_CHOICES, blank=True) + + class Meta: + unique_together = (("driver", "restaurant"),) + +class FoodDeliveryAdmin(admin.ModelAdmin): + list_display=('reference', 'driver', 'restaurant') + list_editable = ('driver', 'restaurant') + + admin.site.register(Article, ArticleAdmin) admin.site.register(CustomArticle, CustomArticleAdmin) admin.site.register(Section, save_as=True, inlines=[ArticleInline]) @@ -706,6 +731,7 @@ admin.site.register(CyclicOne) admin.site.register(CyclicTwo) admin.site.register(WorkHour, WorkHourAdmin) admin.site.register(Reservation) +admin.site.register(FoodDelivery, FoodDeliveryAdmin) # We intentionally register Promo and ChapterXtra1 but not Chapter nor ChapterXtra2. # That way we cover all four cases: -- cgit v1.3