Author: russellm
Date: 2009-05-07 08:10:59 -0500 (Thu, 07 May 2009)
New Revision: 10686
Modified:
django/trunk/django/contrib/admin/options.py
django/trunk/tests/regressiontests/admin_views/tests.py
Log:
Fixed #10899 -- Ensured that log messages for deletions in the admin contain
useful descriptions. Thanks to Jeremy Dunck for the patch.
Modified: django/trunk/django/contrib/admin/options.py
===================================================================
--- django/trunk/django/contrib/admin/options.py 2009-05-07 12:54:33 UTC
(rev 10685)
+++ django/trunk/django/contrib/admin/options.py 2009-05-07 13:10:59 UTC
(rev 10686)
@@ -1012,9 +1012,9 @@
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):
Modified: django/trunk/tests/regressiontests/admin_views/tests.py
===================================================================
--- django/trunk/tests/regressiontests/admin_views/tests.py 2009-05-07
12:54:33 UTC (rev 10685)
+++ django/trunk/tests/regressiontests/admin_views/tests.py 2009-05-07
13:10:59 UTC (rev 10686)
@@ -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 @@
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):
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
