From 10894da8a840a6d7d99add4bf372215b8a600f06 Mon Sep 17 00:00:00 2001 From: Karen Tracey Date: Tue, 16 Dec 2008 15:04:47 +0000 Subject: Fixed #9859 -- Added another missing force_unicode needed in admin when running on Python 2.3. Many thanks for report & patch to nfg. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9656 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/admin_views/models.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (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 d381edadd0..08cc404603 100644 --- a/tests/regressiontests/admin_views/models.py +++ b/tests/regressiontests/admin_views/models.py @@ -24,6 +24,20 @@ class Article(models.Model): return self.date.year model_year.admin_order_field = 'date' +class Book(models.Model): + """ + A simple book that has chapters. + """ + name = models.CharField(max_length=100) + +class Chapter(models.Model): + title = models.CharField(max_length=100) + content = models.TextField() + book = models.ForeignKey(Book) + + def __unicode__(self): + return self.title + def callable_year(dt_value): return dt_value.year callable_year.admin_order_field = 'date' @@ -31,6 +45,9 @@ callable_year.admin_order_field = 'date' class ArticleInline(admin.TabularInline): model = Article +class ChapterInline(admin.TabularInline): + model = Chapter + class ArticleAdmin(admin.ModelAdmin): list_display = ('content', 'date', callable_year, 'model_year', 'modeladmin_year') list_filter = ('date',) @@ -92,6 +109,7 @@ class ThingAdmin(admin.ModelAdmin): admin.site.register(Article, ArticleAdmin) admin.site.register(CustomArticle, CustomArticleAdmin) admin.site.register(Section, inlines=[ArticleInline]) +admin.site.register(Book, inlines=[ChapterInline]) admin.site.register(ModelWithStringPrimaryKey) admin.site.register(Color) admin.site.register(Thing, ThingAdmin) -- cgit v1.3