Ticket #6437: karmacounting.diff

django/contrib/comments/models.py

@@ -49 +49 @@
         """
         extra_kwargs = {}
         extra_kwargs.setdefault('select', {})
-        extra_kwargs['select']['_karma_total_good'] = 'SELECT COUNT(*) FROM comments_karmascore, comments_comment WHERE comments_karmascore.comment_id=comments_comment.id AND score=1'
-        extra_kwargs['select']['_karma_total_bad'] = 'SELECT COUNT(*) FROM comments_karmascore, comments_comment WHERE comments_karmascore.comment_id=comments_comment.id AND score=-1'
         return self.filter(**kwargs).extra(**extra_kwargs)
 
     def user_is_moderator(self, user):
@@ -136 +134 @@
     def _fill_karma_cache(self):
         "Helper function that populates good/bad karma caches"
         good, bad = 0, 0
-        for k in self.karmascore_set:
+        for k in self.karmascore_set.all():
             if k.score == -1:
                 bad +=1
             elif k.score == 1: