Commit ab8965c4 authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

Added a few force_unicode() calls around objects in the admin. Required for 

Python 2.3 compatibility. Patch from nfg.

Refs #8151, #8153.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8236 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent be4390f8

django/contrib/admin/options.py

+2 −2
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ class ModelAdmin(BaseModelAdmin): 


        pk_value = new_object._get_pk_val()

        LogEntry.objects.log_action(request.user.id, ContentType.objects.get_for_model(self.model).id, pk_value, force_unicode(new_object), ADDITION)

        msg = _('The %(name)s "%(obj)s" was added successfully.') % {'name': force_unicode(opts.verbose_name), 'obj': new_object}

        msg = _('The %(name)s "%(obj)s" was added successfully.') % {'name': force_unicode(opts.verbose_name), 'obj': force_unicode(new_object)}

        # Here, we distinguish between different save types by checking for

        # the presence of keys in request.POST.

        if request.POST.has_key("_continue"):
@@ -428,7 +428,7 @@ class ModelAdmin(BaseModelAdmin): 
            change_message = _('No fields changed.')

        LogEntry.objects.log_action(request.user.id, ContentType.objects.get_for_model(self.model).id, pk_value, force_unicode(new_object), CHANGE, change_message)



        msg = _('The %(name)s "%(obj)s" was changed successfully.') % {'name': force_unicode(opts.verbose_name), 'obj': new_object}

        msg = _('The %(name)s "%(obj)s" was changed successfully.') % {'name': force_unicode(opts.verbose_name), 'obj': force_unicode(new_object)}

        if request.POST.has_key("_continue"):

            request.user.message_set.create(message=msg + ' ' + _("You may edit it again below."))

            if request.REQUEST.has_key('_popup'):

tests/regressiontests/admin_views/models.py

+9 −5
Original line number Diff line number Diff line
@@ -12,10 +12,14 @@ class Article(models.Model): 
    """

    A simple article to test admin views. Test backwards compatibility.

    """

    title = models.CharField(max_length=100)

    content = models.TextField()

    date = models.DateTimeField()

    section = models.ForeignKey(Section)



    def __unicode__(self):

        return self.title



class ArticleAdmin(admin.ModelAdmin):

    list_display = ('content', 'date')

    list_filter = ('date',)

tests/regressiontests/admin_views/tests.py

+52 −49
Original line number Diff line number Diff line 
# coding: utf-8



from django.test import TestCase

from django.contrib.auth.models import User, Permission
@@ -154,7 +155,8 @@ class AdminViewPermissionsTest(TestCase): 
    def testAddView(self):

        """Test add view restricts access and actually adds items."""



        add_dict = {'content': '<p>great article</p>',

        add_dict = {'title' : 'Døm ikke',

                    'content': '<p>great article</p>',

                    'date_0': '2008-03-18', 'date_1': '10:54:39',

                    'section': 1}
@@ -197,7 +199,8 @@ class AdminViewPermissionsTest(TestCase): 
    def testChangeView(self):

        """Change view should restrict access and allow users to edit items."""



        change_dict = {'content': '<p>edited article</p>',

        change_dict = {'title' : 'Ikke fordømt',

                       'content': '<p>edited article</p>',

                       'date_0': '2008-03-18', 'date_1': '10:54:39',

                       'section': 1}