From cb996cce059ec6f384d7ee9b67df6208c92eb719 Mon Sep 17 00:00:00 2001 From: Luke Plant Date: Fri, 3 Jun 2011 11:54:29 +0000 Subject: Fixed various bugs related to having multiple columns in admin list_display with the same sort field Thanks to julien for the report Refs #11868 git-svn-id: http://code.djangoproject.com/svn/django/trunk@16319 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/admin_views/models.py | 15 +++++++++++++++ 1 file changed, 15 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 98873966eb..52d96a93f6 100644 --- a/tests/regressiontests/admin_views/models.py +++ b/tests/regressiontests/admin_views/models.py @@ -811,6 +811,20 @@ class OtherStoryAdmin(admin.ModelAdmin): list_editable = ('content', ) ordering = ["-pk"] +class ComplexSortedPerson(models.Model): + name = models.CharField(max_length=100) + age = models.PositiveIntegerField() + is_employee = models.NullBooleanField() + +class ComplexSortedPersonAdmin(admin.ModelAdmin): + list_display = ('name', 'age', 'is_employee', 'colored_name') + ordering = ('name',) + + def colored_name(self, obj): + return '%s' % ('ff00ff', obj.name) + colored_name.allow_tags = True + colored_name.admin_order_field = 'name' + admin.site.register(Article, ArticleAdmin) admin.site.register(CustomArticle, CustomArticleAdmin) admin.site.register(Section, save_as=True, inlines=[ArticleInline]) @@ -872,3 +886,4 @@ admin.site.register(Album, AlbumAdmin) admin.site.register(Question) admin.site.register(Answer) admin.site.register(PrePopulatedPost, PrePopulatedPostAdmin) +admin.site.register(ComplexSortedPerson, ComplexSortedPersonAdmin) -- cgit v1.3