Revert "Fixed #24474 -- Allowed configuring the admin's empty change list value."

This reverts commit 72f769f494822981db6df9524b92a2d86f8e69fe.

There are several test failures that need to be fixed.

2 files changed, 9 insertions, 74 deletions

diff --git a/tests/admin_changelist/admin.py b/tests/admin_changelist/admin.py
index cdc4625098..926a45d518 100644
--- a/tests/admin_changelist/admin.py
+++ b/tests/admin_changelist/admin.py
@@ -125,12 +125,3 @@ class DynamicSearchFieldsChildAdmin(admin.ModelAdmin):
         search_fields = super(DynamicSearchFieldsChildAdmin, self).get_search_fields(request)
         search_fields += ('age',)
         return search_fields
-
-
-class EmptyValueChildAdmin(admin.ModelAdmin):
-    empty_value_display = '-empty-'
-    list_display = ('name', 'age_display', 'age')
-
-    def age_display(self, obj):
-        return obj.age
-    age_display.empty_value_display = '†'
diff --git a/tests/admin_changelist/tests.py b/tests/admin_changelist/tests.py
index a6993586fb..7342e45830 100644
--- a/tests/admin_changelist/tests.py
+++ b/tests/admin_changelist/tests.py
@@ -20,9 +20,9 @@ from .admin import (
     BandAdmin, ChildAdmin, ChordsBandAdmin, CustomPaginationAdmin,
     CustomPaginator, DynamicListDisplayChildAdmin,
     DynamicListDisplayLinksChildAdmin, DynamicListFilterChildAdmin,
-    DynamicSearchFieldsChildAdmin, EmptyValueChildAdmin, FilteredChildAdmin,
-    GroupAdmin, InvitationAdmin, NoListDisplayLinksParentAdmin, ParentAdmin,
-    QuartetAdmin, SwallowAdmin, site as custom_site,
+    DynamicSearchFieldsChildAdmin, FilteredChildAdmin, GroupAdmin,
+    InvitationAdmin, NoListDisplayLinksParentAdmin, ParentAdmin, QuartetAdmin,
+    SwallowAdmin, site as custom_site,
 )
 from .models import (
     Band, Child, ChordsBand, ChordsMusician, CustomIdUser, Event, Genre, Group,
@@ -109,67 +109,14 @@ class ChangeListTests(TestCase):
         list_display = m.get_list_display(request)
         list_display_links = m.get_list_display_links(request, list_display)
         cl = ChangeList(request, Child, list_display, list_display_links,
-            m.list_filter, m.date_hierarchy, m.search_fields,
-            m.list_select_related, m.list_per_page, m.list_max_show_all, m.list_editable, m)
-        cl.formset = None
-        template = Template('{% load admin_list %}{% spaceless %}{% result_list cl %}{% endspaceless %}')
-        context = Context({'cl': cl})
-        table_output = template.render(context)
-        link = reverse('admin:admin_changelist_child_change', args=(new_child.id,))
-        row_html = (
-            '<tbody><tr class="row1"><th class="field-name"><a href="%s">name</a></th>'
-            '<td class="field-parent nowrap">-</td></tr></tbody>' % link
-        )
-        self.assertNotEqual(table_output.find(row_html), -1,
-            'Failed to find expected row element: %s' % table_output)
-
-    def test_result_list_set_empty_value_display_on_admin_site(self):
-        """
-        Test that empty value display can be set on AdminSite
-        """
-        new_child = Child.objects.create(name='name', parent=None)
-        request = self.factory.get('/child/')
-        # Set a new empty display value on AdminSite.
-        admin.site.empty_value_display = '???'
-        m = ChildAdmin(Child, admin.site)
-        list_display = m.get_list_display(request)
-        list_display_links = m.get_list_display_links(request, list_display)
-        cl = ChangeList(request, Child, list_display, list_display_links,
-            m.list_filter, m.date_hierarchy, m.search_fields,
-            m.list_select_related, m.list_per_page, m.list_max_show_all, m.list_editable, m)
-        cl.formset = None
-        template = Template('{% load admin_list %}{% spaceless %}{% result_list cl %}{% endspaceless %}')
-        context = Context({'cl': cl})
-        table_output = template.render(context)
-        link = reverse('admin:admin_changelist_child_change', args=(new_child.id,))
-        row_html = (
-            '<tbody><tr class="row1"><th class="field-name"><a href="%s">name</a></th>'
-            '<td class="field-parent nowrap">???</td></tr></tbody>' % link
-        )
-        self.assertNotEqual(table_output.find(row_html), -1,
-            'Failed to find expected row element: %s' % table_output)
-
-    def test_result_list_set_empty_value_display_in_model_admin(self):
-        """
-        Test that empty value display can be set in ModelAdmin or individual fields.
-        """
-        new_child = Child.objects.create(name='name', parent=None)
-        request = self.factory.get('/child/')
-        m = EmptyValueChildAdmin(Child, admin.site)
-        list_display = m.get_list_display(request)
-        list_display_links = m.get_list_display_links(request, list_display)
-        cl = ChangeList(request, Child, list_display, list_display_links,
-            m.list_filter, m.date_hierarchy, m.search_fields,
-            m.list_select_related, m.list_per_page, m.list_max_show_all, m.list_editable, m)
+                m.list_filter, m.date_hierarchy, m.search_fields,
+                m.list_select_related, m.list_per_page, m.list_max_show_all, m.list_editable, m)
         cl.formset = None
         template = Template('{% load admin_list %}{% spaceless %}{% result_list cl %}{% endspaceless %}')
         context = Context({'cl': cl})
         table_output = template.render(context)
         link = reverse('admin:admin_changelist_child_change', args=(new_child.id,))
-        row_html = (
-            '<tbody><tr class="row1"><th class="field-name"><a href="%s">name</a></th>'
-            '<td class="field-age_display">&dagger;</td><td class="field-age">-empty-</td></tr></tbody>' % link
-        )
+        row_html = '<tbody><tr class="row1"><th class="field-name"><a href="%s">name</a></th><td class="field-parent nowrap">-</td></tr></tbody>' % link
         self.assertNotEqual(table_output.find(row_html), -1,
             'Failed to find expected row element: %s' % table_output)
 
@@ -185,17 +132,14 @@ class ChangeListTests(TestCase):
         list_display = m.get_list_display(request)
         list_display_links = m.get_list_display_links(request, list_display)
         cl = ChangeList(request, Child, list_display, list_display_links,
-            m.list_filter, m.date_hierarchy, m.search_fields,
-            m.list_select_related, m.list_per_page, m.list_max_show_all, m.list_editable, m)
+                m.list_filter, m.date_hierarchy, m.search_fields,
+                m.list_select_related, m.list_per_page, m.list_max_show_all, m.list_editable, m)
         cl.formset = None
         template = Template('{% load admin_list %}{% spaceless %}{% result_list cl %}{% endspaceless %}')
         context = Context({'cl': cl})
         table_output = template.render(context)
         link = reverse('admin:admin_changelist_child_change', args=(new_child.id,))
-        row_html = (
-            '<tbody><tr class="row1"><th class="field-name"><a href="%s">name</a></th>'
-            '<td class="field-parent nowrap">Parent object</td></tr></tbody>' % link
-        )
+        row_html = '<tbody><tr class="row1"><th class="field-name"><a href="%s">name</a></th><td class="field-parent nowrap">Parent object</td></tr></tbody>' % link
         self.assertNotEqual(table_output.find(row_html), -1,
             'Failed to find expected row element: %s' % table_output)