diff --git a/django/contrib/admin/util.py b/django/contrib/admin/util.py
index 17213ea5b3..2ec507f924 100644
--- a/django/contrib/admin/util.py
+++ b/django/contrib/admin/util.py
@@ -104,7 +104,7 @@ def get_deleted_objects(deleted_objects, perms_needed, user, obj, opts, current_
if not has_admin:
# Don't display link to edit, because it either has no
# admin or is edited inline.
- nh(deleted_objects, current_depth, [u'%s: %s' % (force_unicode(capfirst(related.opts.verbose_name)), sub_obj), []])
+ nh(deleted_objects, current_depth, [u'%s: %s' % (capfirst(related.opts.verbose_name), force_unicode(sub_obj)), []])
else:
# Display a link to the admin page.
nh(deleted_objects, current_depth, [mark_safe(u'%s: %s' % \
diff --git a/tests/regressiontests/admin_views/fixtures/admin-views-unicode.xml b/tests/regressiontests/admin_views/fixtures/admin-views-unicode.xml
new file mode 100644
index 0000000000..91bca2e8b5
--- /dev/null
+++ b/tests/regressiontests/admin_views/fixtures/admin-views-unicode.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
diff --git a/tests/regressiontests/admin_views/models.py b/tests/regressiontests/admin_views/models.py
index d381edadd0..08cc404603 100644
--- a/tests/regressiontests/admin_views/models.py
+++ b/tests/regressiontests/admin_views/models.py
@@ -24,6 +24,20 @@ class Article(models.Model):
return self.date.year
model_year.admin_order_field = 'date'
+class Book(models.Model):
+ """
+ A simple book that has chapters.
+ """
+ name = models.CharField(max_length=100)
+
+class Chapter(models.Model):
+ title = models.CharField(max_length=100)
+ content = models.TextField()
+ book = models.ForeignKey(Book)
+
+ def __unicode__(self):
+ return self.title
+
def callable_year(dt_value):
return dt_value.year
callable_year.admin_order_field = 'date'
@@ -31,6 +45,9 @@ callable_year.admin_order_field = 'date'
class ArticleInline(admin.TabularInline):
model = Article
+class ChapterInline(admin.TabularInline):
+ model = Chapter
+
class ArticleAdmin(admin.ModelAdmin):
list_display = ('content', 'date', callable_year, 'model_year', 'modeladmin_year')
list_filter = ('date',)
@@ -92,6 +109,7 @@ class ThingAdmin(admin.ModelAdmin):
admin.site.register(Article, ArticleAdmin)
admin.site.register(CustomArticle, CustomArticleAdmin)
admin.site.register(Section, inlines=[ArticleInline])
+admin.site.register(Book, inlines=[ChapterInline])
admin.site.register(ModelWithStringPrimaryKey)
admin.site.register(Color)
admin.site.register(Thing, ThingAdmin)
diff --git a/tests/regressiontests/admin_views/tests.py b/tests/regressiontests/admin_views/tests.py
index bf2c3f31a6..391d1ffa3e 100644
--- a/tests/regressiontests/admin_views/tests.py
+++ b/tests/regressiontests/admin_views/tests.py
@@ -684,3 +684,54 @@ class SecureViewTest(TestCase):
self.client.post('/test_admin/admin/secure-view/', self.super_login)
# make sure the view removes test cookie
self.failUnlessEqual(self.client.session.test_cookie_worked(), False)
+
+class AdminViewUnicodeTest(TestCase):
+ fixtures = ['admin-views-unicode.xml']
+
+ def setUp(self):
+ self.client.login(username='super', password='secret')
+
+ def tearDown(self):
+ self.client.logout()
+
+ def testUnicodeEdit(self):
+ """
+ A test to ensure that POST on edit_view handles non-ascii characters.
+ """
+ post_data = {
+ "name": u"Test lærdommer",
+ # inline data
+ "chapter_set-TOTAL_FORMS": u"6",
+ "chapter_set-INITIAL_FORMS": u"3",
+ "chapter_set-0-id": u"1",
+ "chapter_set-0-title": u"Norske bostaver æøå skaper problemer",
+ "chapter_set-0-content": u"<p>Svært frustrerende med UnicodeDecodeError</p>",
+ "chapter_set-1-id": u"2",
+ "chapter_set-1-title": u"Kjærlighet.",
+ "chapter_set-1-content": u"<p>La kjærligheten til de lidende seire.</p>",
+ "chapter_set-2-id": u"3",
+ "chapter_set-2-title": u"Need a title.",
+ "chapter_set-2-content": u"<p>Newest content</p>",
+ "chapter_set-3-id": u"",
+ "chapter_set-3-title": u"",
+ "chapter_set-3-content": u"",
+ "chapter_set-4-id": u"",
+ "chapter_set-4-title": u"",
+ "chapter_set-4-content": u"",
+ "chapter_set-5-id": u"",
+ "chapter_set-5-title": u"",
+ "chapter_set-5-content": u"",
+ }
+
+ response = self.client.post('/test_admin/admin/admin_views/book/1/', post_data)
+ self.failUnlessEqual(response.status_code, 302) # redirect somewhere
+
+ def testUnicodeDelete(self):
+ """
+ Ensure that the delete_view handles non-ascii characters
+ """
+ delete_dict = {'post': 'yes'}
+ response = self.client.get('/test_admin/admin/admin_views/book/1/delete/')
+ self.failUnlessEqual(response.status_code, 200)
+ response = self.client.post('/test_admin/admin/admin_views/book/1/delete/', delete_dict)
+ self.assertRedirects(response, '/test_admin/admin/admin_views/book/')