summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-06-17 00:53:25 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-06-17 00:53:25 +0000
commitd2080dd694b31d235f16efe748a997ebfdb5b394 (patch)
treeac9fbbe4101bf5c7a8e82fad0430c005bc34d778
parentd3980231ff8cc04d1f17e3d440606b111230b36d (diff)
unicode: Fixed #454 -- Fixed admin bug for custom primary keys. Thanks,
me@hiddedpp.com. git-svn-id: http://code.djangoproject.com/svn/django/branches/unicode@5480 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/admin/views/main.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py
index d4c7ad2848..bc38f17679 100644
--- a/django/contrib/admin/views/main.py
+++ b/django/contrib/admin/views/main.py
@@ -503,7 +503,7 @@ def delete_stage(request, app_label, model_name, object_id):
# Populate deleted_objects, a data structure of all related objects that
# will also be deleted.
- deleted_objects = [u'%s: <a href="../../%s/">%s</a>' % (force_unicode(capfirst(opts.verbose_name)), object_id, escape(obj)), []]
+ deleted_objects = [u'%s: <a href="../../%s/">%s</a>' % (force_unicode(capfirst(opts.verbose_name)), force_unicode(object_id), escape(obj)), []]
perms_needed = sets.Set()
_get_deleted_objects(deleted_objects, perms_needed, request.user, obj, opts, 1)