summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2013-07-01 09:19:55 -0400
committerTim Graham <timograham@gmail.com>2013-07-01 09:19:55 -0400
commita6a905c619e48bb3db4a5fbb09e5e03abb7ed0f6 (patch)
treeb4648d655a4257013dc619225171712a79b4b93b /django
parentcfcf4b3605f9653e4e056088d89932b2a0e4281b (diff)
Updated tests for deprecation of Option.get_(add|change|delete)_permission.
refs #20642.
Diffstat (limited to 'django')
-rw-r--r--django/contrib/admin/util.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/contrib/admin/util.py b/django/contrib/admin/util.py
index a53cd367b4..dd9047c428 100644
--- a/django/contrib/admin/util.py
+++ b/django/contrib/admin/util.py
@@ -3,6 +3,7 @@ from __future__ import unicode_literals
import datetime
import decimal
+from django.contrib.auth import get_permission_codename
from django.db import models
from django.db.models.constants import LOOKUP_SEP
from django.db.models.deletion import Collector
@@ -119,7 +120,7 @@ def get_deleted_objects(objs, opts, user, admin_site, using):
opts.model_name),
None, (quote(obj._get_pk_val()),))
p = '%s.%s' % (opts.app_label,
- opts.get_delete_permission())
+ get_permission_codename('delete', opts))
if not user.has_perm(p):
perms_needed.add(opts.verbose_name)
# Display a link to the admin page.