Ticket #15920: comments_banned.diff

django/contrib/comments/templatetags/comments.py

@@ -91 +91 @@
             qs = qs.filter(is_public=True)
         if getattr(settings, 'COMMENTS_HIDE_REMOVED', True) and 'is_removed' in field_names:
             qs = qs.filter(is_removed=False)
+        if getattr(settings, 'COMMENTS_BANNED_USERS_GROUP', None):
+            where = ['(user_id IS NULL OR user_id NOT IN (SELECT user_id FROM auth_user_groups WHERE group_id = %s))']
+            params = [settings.COMMENTS_BANNED_USERS_GROUP]
+            qs = qs.extra(where=where, params=params)
 
         return qs
 

tests/regressiontests/comment_tests/tests/templatetag_tests.py

@@ -64 +64 @@
         self.assertEqual(out, "")
         self.assertEqual(list(ctx["cl"]), [c2])
 
+    def testGetCommentListBanned(self, tag=None):
+        from django.conf import settings
+        from django.contrib.auth.models import User, Group
+        
+        # Stow.
+        old_banned_group = getattr(settings, 'COMMENTS_BANNED_USERS_GROUP', None)
+        c1, c2, c3, c4 = self.createSomeComments()
+        
+        try:
+            banned_group = Group.objects.get(pk=old_banned_group)
+        except Group.DoesNotExist:
+            banned_group = Group.objects.create(
+                name="Banned commentors"
+            )
+        
+        settings.COMMENTS_BANNED_USERS_GROUP = banned_group.pk
+        
+        # Ensure it looks right pre-ban.
+        t = "{% load comments %}" + (tag or "{% get_comment_list for comment_tests.article 1 as cl %}")
+        ctx, out = self.render(t)
+        self.assertEqual(out, "")
+        self.assertEqual(list(ctx["cl"]), [c1, c3])
+        
+        # Ban the user.
+        user = User.objects.get(username='frank_nobody')
+        user.groups.add(banned_group)
+        
+        t = "{% load comments %}" + (tag or "{% get_comment_list for comment_tests.article 1 as cl %}")
+        ctx, out = self.render(t)
+        self.assertEqual(out, "")
+        # The banned user's comment is no longer included.
+        self.assertEqual(list(ctx["cl"]), [c1])
+        
+        # Restore.
+        if old_banned_group:
+            settings.COMMENTS_BANNED_USERS_GROUP = old_banned_group
+        else:
+            del(settings.COMMENTS_BANNED_USERS_GROUP)
+
     def testGetCommentListFromLiteral(self):
         self.testGetCommentList("{% get_comment_list for comment_tests.author 1 as cl %}")