Commit 8397c1fd authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.0.X] Fixed #10899 -- Ensured that log messages for deletions in the admin... 

[1.0.X] Fixed #10899 -- Ensured that log messages for deletions in the admin contain useful descriptions. Thanks to Jeremy Dunck for the patch.

Merge of r10686 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10720 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 41ba8e7c

django/contrib/admin/options.py

+41 −41
Original line number Diff line number Diff line
@@ -705,9 +705,9 @@ class ModelAdmin(BaseModelAdmin): 
            if perms_needed:

                raise PermissionDenied

            obj_display = force_unicode(obj)

            self.log_deletion(request, obj, obj_display)

            obj.delete()



            self.log_deletion(request, obj, obj_display)

            self.message_user(request, _('The %(name)s "%(obj)s" was deleted successfully.') % {'name': force_unicode(opts.verbose_name), 'obj': force_unicode(obj_display)})



            if not self.has_change_permission(request, None):

tests/regressiontests/admin_views/tests.py

+4 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ from django.core.files import temp as tempfile 
from django.test import TestCase

from django.contrib.auth.models import User, Permission

from django.contrib.contenttypes.models import ContentType

from django.contrib.admin.models import LogEntry

from django.contrib.admin.models import LogEntry, DELETION

from django.contrib.admin.sites import LOGIN_FORM_KEY

from django.contrib.admin.util import quote

from django.utils.html import escape
@@ -557,6 +557,9 @@ class AdminViewPermissionsTest(TestCase): 
        post = self.client.post('/test_admin/admin/admin_views/article/1/delete/', delete_dict)

        self.assertRedirects(post, '/test_admin/admin/')

        self.failUnlessEqual(Article.objects.all().count(), 2)

        article_ct = ContentType.objects.get_for_model(Article)

        logged = LogEntry.objects.get(content_type=article_ct, action_flag=DELETION)

        self.failUnlessEqual(logged.object_id, u'1')

        self.client.get('/test_admin/admin/logout/')



class AdminViewStringPrimaryKeyTest(TestCase):