Ticket #15291: 15291_changelist_alignment.2.diff

File 15291_changelist_alignment.2.diff, 3.0 KB (added by Julien Phalip, 14 years ago)

Fixed tests

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

    diff --git a/django/contrib/admin/media/css/changelists.css b/django/contrib/admin/media/css/changelists.css
    index 282833c..4e3402f 100644
    a b  
    6767#changelist table tbody td:first-child {
    6868    border-left: 0;
    6969    border-right: 1px solid #ddd;
    70     text-align: center;
     70}
     71
     72#changelist table tbody td.action-checkbox {
     73    text-align:center;
    7174}
    7275
    7376#changelist table tfoot {
  • django/contrib/admin/templatetags/admin_list.py

    diff --git a/django/contrib/admin/templatetags/admin_list.py b/django/contrib/admin/templatetags/admin_list.py
    index 806be24..57e8ab7 100644
    a b def items_for_result(cl, result, form):  
    139139            result_repr = EMPTY_CHANGELIST_VALUE
    140140        else:
    141141            if f is None:
     142                if field_name == u'action_checkbox':
     143                    row_class = ' class="action-checkbox"'
    142144                allow_tags = getattr(attr, 'allow_tags', False)
    143145                boolean = getattr(attr, 'boolean', False)
    144146                if boolean:
  • tests/regressiontests/admin_changelist/tests.py

    diff --git a/tests/regressiontests/admin_changelist/tests.py b/tests/regressiontests/admin_changelist/tests.py
    index c3f6186..e9b2e32 100644
    a b class ChangeListTests(TransactionTestCase):  
    3535        template = Template('{% load admin_list %}{% spaceless %}{% result_list cl %}{% endspaceless %}')
    3636        context = Context({'cl': cl})
    3737        table_output = template.render(context)
    38         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>'
     38        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>'
    3939        self.assertFalse(table_output.find(row_html) == -1,
    4040            'Failed to find expected row element: %s' % table_output)
    4141
    class ChangeListTests(TransactionTestCase):  
    5656        template = Template('{% load admin_list %}{% spaceless %}{% result_list cl %}{% endspaceless %}')
    5757        context = Context({'cl': cl})
    5858        table_output = template.render(context)
    59         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>'
     59        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>'
    6060        self.assertFalse(table_output.find(row_html) == -1,
    6161            'Failed to find expected row element: %s' % table_output)
    6262
Back to Top