Fixed #12793 - Only use the admin actions JavaScript if not explicitly deactivated with 'actions = None' in the ModelAdmin. Thanks, Florian Apolloner.

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

1 files changed, 2 insertions, 0 deletions

diff --git a/django/contrib/admin/templates/admin/change_list.html b/django/contrib/admin/templates/admin/change_list.html
index caa1c03868..ac456aa4a8 100644
--- a/django/contrib/admin/templates/admin/change_list.html
+++ b/django/contrib/admin/templates/admin/change_list.html
@@ -19,6 +19,7 @@
 
 {% block extrahead %}
 {{ block.super }}
+{% if action_form %}{% if actions_on_top or actions_on_bottom %}
 <script type="text/javascript">
 (function($) {
     $(document).ready(function($) {
@@ -26,6 +27,7 @@
     });
 })(jQuery.noConflict());
 </script>
+{% endif %}{% endif %}
 {% endblock %}
 
 {% block bodyclass %}change-list{% endblock %}