Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

[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 authored February 19, 2011
5  django/contrib/admin/media/css/changelists.css
@@ -67,7 +67,10 @@
67 67
 #changelist table tbody td:first-child, #changelist table tbody th:first-child {
68 68
     border-left: 0;
69 69
     border-right: 1px solid #ddd;
70  
-    text-align: center;
  70
+}
  71
+
  72
+#changelist table tbody td.action-checkbox {
  73
+    text-align:center;
71 74
 }
72 75
 
73 76
 #changelist table tfoot {
2  django/contrib/admin/templatetags/admin_list.py
@@ -140,6 +140,8 @@ def items_for_result(cl, result, form):
140 140
             result_repr = EMPTY_CHANGELIST_VALUE
141 141
         else:
142 142
             if f is None:
  143
+                if field_name == u'action_checkbox':
  144
+                    row_class = ' class="action-checkbox"'
143 145
                 allow_tags = getattr(attr, 'allow_tags', False)
144 146
                 boolean = getattr(attr, 'boolean', False)
145 147
                 if boolean:
4  tests/regressiontests/admin_changelist/tests.py
@@ -32,7 +32,7 @@ def test_result_list_empty_changelist_value(self):
32 32
         template = Template('{% load admin_list %}{% spaceless %}{% result_list cl %}{% endspaceless %}')
33 33
         context = Context({'cl': cl})
34 34
         table_output = template.render(context)
35  
-        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>'
  35
+        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>'
36 36
         self.assertFalse(table_output.find(row_html) == -1,
37 37
             'Failed to find expected row element: %s' % table_output)
38 38
 
@@ -53,7 +53,7 @@ def test_result_list_html(self):
53 53
         template = Template('{% load admin_list %}{% spaceless %}{% result_list cl %}{% endspaceless %}')
54 54
         context = Context({'cl': cl})
55 55
         table_output = template.render(context)
56  
-        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>'
  56
+        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>'
57 57
         self.assertFalse(table_output.find(row_html) == -1,
58 58
             'Failed to find expected row element: %s' % table_output)
59 59
 

0 notes on commit efc4c62

Please sign in to comment.
Something went wrong with that request. Please try again.