Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #10899 -- Ensured that log messages for deletions in the admin …

…contain useful descriptions. Thanks to Jeremy Dunck for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10686 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit ae7d9bfad2c92ebe30ce8ca0a145eba4504312f1 1 parent b5f0aff
Russell Keith-Magee freakboy3742 authored
2  django/contrib/admin/options.py
View
@@ -1012,9 +1012,9 @@ def delete_view(self, request, object_id, extra_context=None):
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):
5 tests/regressiontests/admin_views/tests.py
View
@@ -6,7 +6,7 @@
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.contrib.admin.helpers import ACTION_CHECKBOX_NAME
@@ -544,6 +544,9 @@ def testDeleteView(self):
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):
Please sign in to comment.
Something went wrong with that request. Please try again.