Ticket #10595: patch_django_10595.20090324.diff

django/contrib/admin/options.py

@@ -207 +207 @@
         for inline_class in self.inlines:
             inline_instance = inline_class(self.model, self.admin_site)
             self.inline_instances.append(inline_instance)
-        if 'action_checkbox' not in self.list_display:
+        if 'action_checkbox' not in self.list_display and self.actions is not None:
             self.list_display = ['action_checkbox'] +  list(self.list_display)
         if not self.list_display_links:
             for name in self.list_display:
@@ -421 +421 @@
         """
         actions = {}
         for klass in [self.admin_site] + self.__class__.mro()[::-1]:
-            for action in getattr(klass, 'actions', []):
+            class_actions = getattr(klass, 'actions', [])
+            if not class_actions:
+                continue # avoid iteration over None value
+            for action in class_actions:
                 func, name, description = self.get_action(action)
                 actions[name] = (func, name, description)
         return actions
@@ -948 +951 @@
             media = self.media
             
         # Build the action form and populate it with available actions.
-        action_form = self.action_form(auto_id=None)
-        action_form.fields['action'].choices = self.get_action_choices(request)        
+        if self.actions is None:
+            action_form = False
+            actions_on_top = False
+            actions_on_bottom = False
+        else:
+            action_form = self.action_form(auto_id=None)
+            action_form.fields['action'].choices = self.get_action_choices(request)
+            actions_on_top = self.actions_on_top
+            actions_on_bottom = self.actions_on_bottom
 
         context = {
             'title': cl.title,
@@ -960 +970 @@
             'root_path': self.admin_site.root_path,
             'app_label': app_label,
             'action_form': action_form,
-            'actions_on_top': self.actions_on_top,
-            'actions_on_bottom': self.actions_on_bottom,
+            'actions_on_top': actions_on_top,
+            'actions_on_bottom': actions_on_bottom,
         }
         context.update(extra_context or {})
         return render_to_response(self.change_list_template or [

django/contrib/admin/templates/admin/change_list.html

@@ -9 +9 @@
     <script type="text/javascript" src="../../jsi18n/"></script>
   {% endif %}
   {{ media }}
+  {% if not actions_on_top and not actions_on_bottom %}
+    <style>
+      #changelist table thead th:first-child {width: inherit}
+    </style>
+  {% endif %}
 {% endblock %}
 
 {% block bodyclass %}change-list{% endblock %}