Excluded unpublished comments from the displayed count for sites with…

… plone.app.discussion.

git-svn-id: http://svn.plone.org/svn/collective/Scrawl/trunk@248779 db7f04ef-aaf3-0310-a811-c281ed44c4ad

CHANGES.txt

@@ -4,6 +4,10 @@ Changelog
 Scrawl 2.0 - unreleased
 -----------------------
 
+- Excluded unpublished comments from the displayed count for sites with
+  plone.app.discussion.
+  [yomatters]
+
 - Allowed filtering of blog view by author.
   [yomatters]
 

Products/Scrawl/browser/blog.py

@@ -25,7 +25,10 @@ def comment_count(self, obj):
         if HAS_PAD:
             if IDiscussionLayer.providedBy(self.request):
                 conversation = IConversation(obj)
-                return conversation.enabled() and len(conversation)
+                if conversation.enabled():
+                    workflow = getToolByName(self.context, 'portal_workflow')
+                    return len([c for c in conversation.values() \
+                        if workflow.getInfoFor(c, 'review_state') == 'published'])
         if self.portal_discussion.isDiscussionAllowedFor(obj):
             discussion = self.portal_discussion.getDiscussionFor(obj)
             return discussion.replyCount(obj)