Author: jezdez
Date: 2010-02-07 08:41:43 -0600 (Sun, 07 Feb 2010)
New Revision: 12396
Modified:
django/trunk/django/contrib/admin/templates/admin/change_list.html
Log:
Fixed #12793 - Only use the admin actions JavaScript if not explicitly
deactivated with 'actions = None' in the ModelAdmin. Thanks, Florian Apolloner.
Modified: django/trunk/django/contrib/admin/templates/admin/change_list.html
===================================================================
--- django/trunk/django/contrib/admin/templates/admin/change_list.html
2010-02-06 20:48:55 UTC (rev 12395)
+++ django/trunk/django/contrib/admin/templates/admin/change_list.html
2010-02-07 14:41:43 UTC (rev 12396)
@@ -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 %}
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
