diff -r b758351d191f -r cc9b7e14412b web/lib/django/contrib/admin/actions.py --- a/web/lib/django/contrib/admin/actions.py Wed May 19 17:43:59 2010 +0200 +++ b/web/lib/django/contrib/admin/actions.py Tue May 25 02:43:45 2010 +0200 @@ -12,10 +12,6 @@ from django.utils.safestring import mark_safe from django.utils.text import capfirst from django.utils.translation import ugettext_lazy, ugettext as _ -try: - set -except NameError: - from sets import Set as set # Python 2.3 fallback def delete_selected(modeladmin, request, queryset): """ @@ -36,15 +32,7 @@ # Populate deletable_objects, a data structure of all related objects that # will also be deleted. - - # deletable_objects must be a list if we want to use '|unordered_list' in the template - deletable_objects = [] - perms_needed = set() - i = 0 - for obj in queryset: - deletable_objects.append([mark_safe(u'%s: %s' % (escape(force_unicode(capfirst(opts.verbose_name))), obj.pk, escape(obj))), []]) - get_deleted_objects(deletable_objects[i], perms_needed, request.user, obj, opts, 1, modeladmin.admin_site, levels_to_root=2) - i=i+1 + deletable_objects, perms_needed = get_deleted_objects(queryset, opts, request.user, modeladmin.admin_site, levels_to_root=2) # The user has already confirmed the deletion. # Do the deletion and return a None to display the change list view again. @@ -66,7 +54,7 @@ context = { "title": _("Are you sure?"), "object_name": force_unicode(opts.verbose_name), - "deletable_objects": deletable_objects, + "deletable_objects": [deletable_objects], 'queryset': queryset, "perms_lacking": perms_needed, "opts": opts, @@ -76,7 +64,7 @@ } # Display the confirmation page - return render_to_response(modeladmin.delete_confirmation_template or [ + return render_to_response(modeladmin.delete_selected_confirmation_template or [ "admin/%s/%s/delete_selected_confirmation.html" % (app_label, opts.object_name.lower()), "admin/%s/delete_selected_confirmation.html" % app_label, "admin/delete_selected_confirmation.html"