Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.2.X] Fixed #15291 -- Corrected alignment issue when actions are di…

…sabled in a ModelAdmin. Thanks to Julien Phalip for the report and patch.

Backport of r15573 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15577 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit efc4c62691134bdea50195b7b60f41c5639de738 1 parent c94804b
Russell Keith-Magee freakboy3742 authored
5 django/contrib/admin/media/css/changelists.css
View
@@ -67,7 +67,10 @@
#changelist table tbody td:first-child, #changelist table tbody th:first-child {
border-left: 0;
border-right: 1px solid #ddd;
- text-align: center;
+}
+
+#changelist table tbody td.action-checkbox {
+ text-align:center;
}
#changelist table tfoot {
2  django/contrib/admin/templatetags/admin_list.py
View
@@ -140,6 +140,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:
4 tests/regressiontests/admin_changelist/tests.py
View
@@ -32,7 +32,7 @@ def test_result_list_empty_changelist_value(self):
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)
@@ -53,7 +53,7 @@ def test_result_list_html(self):
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)
Please sign in to comment.
Something went wrong with that request. Please try again.