Ticket #10677: 10677.diff

django/contrib/comments/moderation.py

@@ -66 +66 @@
 
 from django.conf import settings
 from django.core.mail import send_mail
-from django.db.models import signals
+from django.contrib.comments import signals
 from django.db.models.base import ModelBase
 from django.template import Context, loader
 from django.contrib import comments
@@ -341 +341 @@
         from the comment models.
 
         """
-        signals.pre_save.connect(self.pre_save_moderation, sender=comments.get_model())
-        signals.post_save.connect(self.post_save_moderation, sender=comments.get_model())
+        signals.comment_will_be_posted.connect(self.pre_save_moderation, sender=comments.get_model())
+        signals.comment_was_posted.connect(self.post_save_moderation, sender=comments.get_model())
 
     def register(self, model_or_iterable, moderation_class):
         """
@@ -376 +376 @@
                 raise NotModerated("The model '%s' is not currently being moderated" % model._meta.module_name)
             del self._registry[model]
 
-    def pre_save_moderation(self, sender, instance, **kwargs):
+    def pre_save_moderation(self, sender, **kwargs):
         """
         Apply any necessary pre-save moderation steps to new
         comments.
 
         """
+        instance = kwargs['comment']
         model = instance.content_type.model_class()
         if instance.id or (model not in self._registry):
             return
@@ -393 +394 @@
         if moderation_class.moderate(instance, content_object):
             instance.is_public = False
 
-    def post_save_moderation(self, sender, instance, **kwargs):
+    def post_save_moderation(self, sender, **kwargs):
         """
         Apply any necessary post-save moderation steps to new
         comments.
 
         """
+        instance = kwargs['comment']
         model = instance.content_type.model_class()
         if model not in self._registry:
             return

django/contrib/comments/views/comments.py

@@ -109 +109 @@
         comment = comment,
         request = request
     )
-
+    if not comment._get_pk_val():
+        # If comment was deleted by any of the 
+        # signal handlers.
+        return next_redirect(data, next, comment_done)
     return next_redirect(data, next, comment_done, c=comment._get_pk_val())
 
 post_comment = require_POST(post_comment)

docs/ref/contrib/comments/moderation.txt

@@ -221 +221 @@
         and :data:`~django.db.models.signals.post_save` signals from the
         comment models.
 
-    .. method:: pre_save_moderation(sender, instance, **kwargs)
+    .. method:: pre_save_moderation(sender, **kwargs)
 
         In the base implementation, applies all pre-save moderation
         steps (such as determining whether the comment needs to be
         deleted, or whether it needs to be marked as non-public or
         generate an email).
 
-    .. method:: post_save_moderation(sender, instance, **kwargs)
+    .. method:: post_save_moderation(sender, **kwargs)
 
         In the base implementation, applies all post-save moderation
         steps (currently this consists entirely of deleting comments