From 37f7ef41fbaebd5f545b99a11ab6036d92f9232b Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Mon, 28 Dec 2015 15:31:45 -0500 Subject: Fixed #24316 -- Made ModelAdmin.list_display callables use an appropriate CSS class name. Thanks Berker Peksag for the review. --- tests/admin_views/admin.py | 2 +- tests/admin_views/tests.py | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/admin_views/admin.py b/tests/admin_views/admin.py index 932a29f3ac..bc2d08fc71 100644 --- a/tests/admin_views/admin.py +++ b/tests/admin_views/admin.py @@ -90,7 +90,7 @@ class ChapterXtra1Admin(admin.ModelAdmin): class ArticleAdmin(admin.ModelAdmin): list_display = ( 'content', 'date', callable_year, 'model_year', 'modeladmin_year', - 'model_year_reversed', 'section', + 'model_year_reversed', 'section', lambda obj: obj.title, ) list_editable = ('section',) list_filter = ('date', 'section') diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py index 22a5d87231..55ff3c5c08 100644 --- a/tests/admin_views/tests.py +++ b/tests/admin_views/tests.py @@ -344,6 +344,15 @@ class AdminViewBasicTest(AdminViewBasicTestCase): # started with 3 articles, one was deleted. self.assertEqual(Section.objects.latest('id').article_set.count(), 2) + def test_change_list_column_field_classes(self): + response = self.client.get(reverse('admin:admin_views_article_changelist')) + # callables display the callable name. + self.assertContains(response, 'column-callable_year') + self.assertContains(response, 'field-callable_year') + # lambdas display as "lambda" + index that they appear in list_display. + self.assertContains(response, 'column-lambda8') + self.assertContains(response, 'field-lambda8') + def test_change_list_sorting_callable(self): """ Ensure we can sort on a list_display field that is a callable -- cgit v1.3