Ticket #24316: 24316_test_case_1.diff

tests/admin_changelist/admin.py

@@ -17 +17 @@
 
 
 class EventAdmin(admin.ModelAdmin):
-    list_display = ['event_date_func']
+    event_year_lambda = lambda event: event.date.year
+    event_year_lambda.short_description = 'Year'
+
+    list_display = ['event_date_func', event_year_lambda]
 
     def event_date_func(self, event):
         return event.date
+    event_date_func.short_description = "Event date"
 
 site.register(Event, EventAdmin)
 

tests/admin_changelist/tests.py

@@ -441 +441 @@
         self.assertContains(response, formats.localize(event.date))
         self.assertNotContains(response, six.text_type(event.date))
 
+    def test_list_display_css_class_of_function_uses_short_description_in_th(self):
+        User.objects.create_superuser(
+            username='super', email='super@localhost', password='secret')
+        self.client.login(username='super', password='secret')
+        event = Event.objects.create(date=datetime.date.today())
+        response = self.client.get('/admin/admin_changelist/event/')
+        self.assertNotContains(response, 'class="column-<function EventAdmin.<lambda>')
+        self.assertContains(response, 'class="column-year"')
+
+    def test_list_display_css_class_of_function_uses_short_description_in_td(self):
+        User.objects.create_superuser(
+            username='super', email='super@localhost', password='secret')
+        self.client.login(username='super', password='secret')
+        event = Event.objects.create(date=datetime.date.today())
+        response = self.client.get('/admin/admin_changelist/event/')
+        self.assertNotContains(response, 'class="field-<function EventAdmin.<lambda>')
+        self.assertContains(response, 'class="field-year"')
+
     def test_dynamic_list_display(self):
         """
         Regression tests for #14206: dynamic list_display support.