innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

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
This commit is contained in:
Jannis Leidel 2010-02-07 14:41:43 +00:00
parent d334713ea2
commit f5ee28931d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/admin/templates/admin/change_list.html
View File

@ -19,6 +19,7 @@
{% block extrahead %} {% block extrahead %}
{{ block.super }} {{ block.super }}
{% if action_form %}{% if actions_on_top or actions_on_bottom %}
<script type="text/javascript"> <script type="text/javascript">
(function($) { (function($) {
$(document).ready(function($) { $(document).ready(function($) {
@ -26,6 +27,7 @@
}); });
})(jQuery.noConflict()); })(jQuery.noConflict());
</script> </script>
{% endif %}{% endif %}
{% endblock %} {% endblock %}
{% block bodyclass %}change-list{% endblock %} {% block bodyclass %}change-list{% endblock %}