Ticket #12018: 12018.diff

django/contrib/comments/moderation.py

@@ -60 +60 @@
 from django.core.mail import send_mail
 from django.contrib.comments import signals
 from django.db.models.base import ModelBase
-from django.template import Context, loader
+from django.template import RequestContext, loader
 from django.contrib import comments
 from django.contrib.sites.models import Site
 
@@ -227 +227 @@
                 return True
         return False
 
-    def email(self, comment, content_object, request):
+    def email(self, comment, content_object, request, extra_context=None):
         """
         Send email notification of a new comment to site staff when email
         notifications have been requested.
@@ -237 +237 @@
             return
         recipient_list = [manager_tuple[1] for manager_tuple in settings.MANAGERS]
         t = loader.get_template('comments/comment_notification_email.txt')
-        c = Context({ 'comment': comment,
-                      'content_object': content_object })
+
+        context = { 'comment': comment, 'content_object': content_object }
+        context.update(extra_context or {})
         subject = '[%s] New comment posted on "%s"' % (Site.objects.get_current().name,
                                                           content_object)
-        message = t.render(c)
+        message = t.render(RequestContext(request, context))
         send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, recipient_list, fail_silently=True)
 
 class Moderator(object):

docs/ref/contrib/comments/moderation.txt

@@ -159 +159 @@
     post on the content object, and ``False`` otherwise (in which
     case the comment will be immediately deleted).
 
-.. method:: CommentModerator.email(comment, content_object, request)
+.. method:: CommentModerator.email(comment, content_object, request, extra_context=None)
 
     If email notification of the new comment should be sent to
     site staff or moderators, this method is responsible for

tests/regressiontests/comment_tests/tests/comment_utils_moderators_tests.py

@@ -4 +4 @@
 from django.contrib.comments.moderation import moderator, CommentModerator, AlreadyModerated
 from regressiontests.comment_tests.models import Entry
 from django.core import mail
+from django.template import loader, RequestContext
+from django.contrib.auth.models import User
+from django.conf import settings
+import django.template.context
 
 class EntryModerator1(CommentModerator):
     email_notification = True
@@ -27 +31 @@
     auto_close_field = 'pub_date'
     close_after = 0
 
+class EntryModerator7(CommentModerator):
+    email_notification = True
+
+    def email(self, comment, content_object, request, extra_context=None):
+        extra_context = extra_context or {}
+        extra_context["foo"] = "bar"
+        super(EntryModerator7, self).email(comment, content_object, request, extra_context=extra_context)
+
 class CommentUtilsModeratorTests(CommentTestCase):
     fixtures = ["comment_utils.xml"]
 
@@ -90 +102 @@
     def testAutoCloseFieldImmediate(self):
         moderator.register(Entry, EntryModerator6)
         c1, c2 = self.createSomeComments()
-        self.assertEqual(Comment.objects.all().count(), 0)
- No newline at end of file
+        self.assertEqual(Comment.objects.all().count(), 0)
+
+class CommentUtilsModeratorEmailTemplateTests(CommentUtilsModeratorTests):
+    def setUp(self):
+        super(CommentUtilsModeratorEmailTemplateTests, self).setUp()
+        self.orig_context_processors = settings.TEMPLATE_CONTEXT_PROCESSORS
+        settings.TEMPLATE_CONTEXT_PROCESSORS += ("django.core.context_processors.request",)
+        django.template.context._standard_context_processors = None
+        self.user = User.objects.create(username="frank_nobody",
+                                        email="fnobody@example.com",
+                                        password="",
+                                        is_active=True,
+                                        is_superuser=False,
+                                        is_staff=False)
+        self.user.set_password("password")
+        self.user.save()
+        logged_in = self.client.login(username="frank_nobody", password="password")
+        self.assertTrue(logged_in)        
+
+    def tearDown(self):
+        super(CommentUtilsModeratorEmailTemplateTests, self).tearDown()
+        settings.TEMPLATE_CONTEXT_PROCESSORS = self.orig_context_processors
+        django.template.context._standard_context_processors = None
+
+    def testEmailTemplate(self):
+        moderator.register(Entry, EntryModerator7)
+        c1, c2 = self.createSomeComments()
+        c1.user = self.user
+        c1.save()
+        # Send the user along as the test client's request does not have request.user
+        response = self.client.get("/", user=self.user)
+        request = response.request
+        content_type = c1.content_type
+        content_object = content_type.get_object_for_this_type(pk=c1.object_pk)
+        request_context = RequestContext(request, {})
+        template_contents = loader.render_to_string("comments/comment_notification_email.txt",
+                                                    {"comment": c1, 
+                                                     "content_object": content_object,
+                                                     "foo": "bar"}, 
+                                                    context_instance=request_context)
+        self.assertEquals(template_contents, mail.outbox[0].body)

tests/templates/comments/comment_notification_email.txt

@@ -1 +1 @@
 A comment has been posted on {{ content_object }}.
 The comment reads as follows:
 {{ comment }}
+
+Extra Context: {{ foo }}
+Request User: {{ request.user }}