Commit b3c7e399 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

Fixed #15291 -- Corrected alignment issue when actions are disabled in a... 

Fixed #15291 -- Corrected alignment issue when actions are disabled in a ModelAdmin. Thanks to Julien Phalip for the report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15573 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent d3cc5dbb

django/contrib/admin/media/css/changelists.css

+4 −1
Original line number Diff line number Diff line
@@ -67,6 +67,9 @@ 
#changelist table tbody td:first-child, #changelist table tbody th:first-child {

    border-left: 0;

    border-right: 1px solid #ddd;

}



#changelist table tbody td.action-checkbox {

    text-align:center;

}

django/contrib/admin/templatetags/admin_list.py

+2 −0
Original line number Diff line number Diff line
@@ -139,6 +139,8 @@ def items_for_result(cl, result, form): 
            result_repr = EMPTY_CHANGELIST_VALUE

        else:

            if f is None:

                if field_name == u'action_checkbox':

                    row_class = ' class="action-checkbox"'

                allow_tags = getattr(attr, 'allow_tags', False)

                boolean = getattr(attr, 'boolean', False)

                if boolean:

tests/regressiontests/admin_changelist/tests.py

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ class ChangeListTests(TransactionTestCase): 
        template = Template('{% load admin_list %}{% spaceless %}{% result_list cl %}{% endspaceless %}')

        context = Context({'cl': cl})

        table_output = template.render(context)

        row_html = '<tbody><tr class="row1"><td><input type="checkbox" class="action-select" value="1" name="_selected_action" /></td><th><a href="1/">name</a></th><td>(None)</td></tr></tbody>'

        row_html = '<tbody><tr class="row1"><td class="action-checkbox"><input type="checkbox" class="action-select" value="1" name="_selected_action" /></td><th><a href="1/">name</a></th><td>(None)</td></tr></tbody>'

        self.assertFalse(table_output.find(row_html) == -1,

            'Failed to find expected row element: %s' % table_output)
@@ -57,7 +57,7 @@ class ChangeListTests(TransactionTestCase): 
        template = Template('{% load admin_list %}{% spaceless %}{% result_list cl %}{% endspaceless %}')

        context = Context({'cl': cl})

        table_output = template.render(context)

        row_html = '<tbody><tr class="row1"><td><input type="checkbox" class="action-select" value="1" name="_selected_action" /></td><th><a href="1/">name</a></th><td>Parent object</td></tr></tbody>'

        row_html = '<tbody><tr class="row1"><td class="action-checkbox"><input type="checkbox" class="action-select" value="1" name="_selected_action" /></td><th><a href="1/">name</a></th><td>Parent object</td></tr></tbody>'

        self.assertFalse(table_output.find(row_html) == -1,

            'Failed to find expected row element: %s' % table_output)