Ticket #10889: 10889.diff

File 10889.diff, 2.0 KB (added by jdunck, 6 years ago)
  • django/contrib/admin/options.py

    diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
    index c87d903..f69587b 100644
    a b class ModelAdmin(BaseModelAdmin): 
    10101010            if perms_needed:
    10111011                raise PermissionDenied
    10121012            obj_display = force_unicode(obj)
     1013            self.log_deletion(request, obj, obj_display)
    10131014            obj.delete()
    10141015
    1015             self.log_deletion(request, obj, obj_display)
    10161016            self.message_user(request, _('The %(name)s "%(obj)s" was deleted successfully.') % {'name': force_unicode(opts.verbose_name), 'obj': force_unicode(obj_display)})
    10171017
    10181018            if not self.has_change_permission(request, None):
  • tests/regressiontests/admin_views/tests.py

    diff --git a/tests/regressiontests/admin_views/tests.py b/tests/regressiontests/admin_views/tests.py
    index 3d75967..5e1b35e 100644
    a b from django.core.files import temp as tempfile 
    66from django.test import TestCase
    77from django.contrib.auth.models import User, Permission
    88from django.contrib.contenttypes.models import ContentType
    9 from django.contrib.admin.models import LogEntry
     9from django.contrib.admin.models import LogEntry, DELETION
    1010from django.contrib.admin.sites import LOGIN_FORM_KEY
    1111from django.contrib.admin.util import quote
    1212from django.contrib.admin.helpers import ACTION_CHECKBOX_NAME
    class AdminViewPermissionsTest(TestCase): 
    544544        post = self.client.post('/test_admin/admin/admin_views/article/1/delete/', delete_dict)
    545545        self.assertRedirects(post, '/test_admin/admin/')
    546546        self.failUnlessEqual(Article.objects.all().count(), 2)
     547        article_ct = ContentType.objects.get_for_model(Article)
     548        logged = LogEntry.objects.get(content_type=article_ct, action_flag=DELETION)
     549        self.failUnlessEqual(logged.object_id, u'1')
    547550        self.client.get('/test_admin/admin/logout/')
    548551
    549552class AdminViewStringPrimaryKeyTest(TestCase):
Back to Top