← Back to branch summary

~ubuntu-branches/ubuntu/quantal/python-django/quantal-security

« back to all changes in this revision

Viewing changes to django/contrib/admin/actions.py

  • Committer: Bazaar Package Importer
  • Author(s): Chris Lamb
  • Date: 2010-05-21 07:52:55 UTC
  • mfrom: (1.3.6 upstream)
  • mto: This revision was merged to the branch mainline in revision 28.
  • Revision ID: james.westby@ubuntu.com-20100521075255-ii78v1dyfmyu3uzx
Tags: upstream-1.2
Import upstream version 1.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
django/contrib/admin/actions.py
12
12
from django.utils.safestring import mark_safe
13
13
from django.utils.text import capfirst
14
14
from django.utils.translation import ugettext_lazy, ugettext as _
15
 
try:
16
 
    set
17
 
except NameError:
18
 
    from sets import Set as set     # Python 2.3 fallback
19
15
 
20
16
def delete_selected(modeladmin, request, queryset):
21
17
    """
36
32
 
37
33
    # Populate deletable_objects, a data structure of all related objects that
38
34
    # will also be deleted.
39
 
 
40
 
    # deletable_objects must be a list if we want to use '|unordered_list' in the template
41
 
    deletable_objects = []
42
 
    perms_needed = set()
43
 
    i = 0
44
 
    for obj in queryset:
45
 
        deletable_objects.append([mark_safe(u'%s: <a href="%s/">%s</a>' % (escape(force_unicode(capfirst(opts.verbose_name))), obj.pk, escape(obj))), []])
46
 
        get_deleted_objects(deletable_objects[i], perms_needed, request.user, obj, opts, 1, modeladmin.admin_site, levels_to_root=2)
47
 
        i=i+1
 
35
    deletable_objects, perms_needed = get_deleted_objects(queryset, opts, request.user, modeladmin.admin_site, levels_to_root=2)
48
36
 
49
37
    # The user has already confirmed the deletion.
50
38
    # Do the deletion and return a None to display the change list view again.
66
54
    context = {
67
55
        "title": _("Are you sure?"),
68
56
        "object_name": force_unicode(opts.verbose_name),
69
 
        "deletable_objects": deletable_objects,
 
57
        "deletable_objects": [deletable_objects],
70
58
        'queryset': queryset,
71
59
        "perms_lacking": perms_needed,
72
60
        "opts": opts,
76
64
    }
77
65
 
78
66
    # Display the confirmation page
79
 
    return render_to_response(modeladmin.delete_confirmation_template or [
 
67
    return render_to_response(modeladmin.delete_selected_confirmation_template or [
80
68
        "admin/%s/%s/delete_selected_confirmation.html" % (app_label, opts.object_name.lower()),
81
69
        "admin/%s/delete_selected_confirmation.html" % app_label,
82
70
        "admin/delete_selected_confirmation.html"