From 7a734ec8bc17385012d9d58c7f062c76199ec8ba Mon Sep 17 00:00:00 2001
From: Jack Cheng <jack.cheng@commercan.com>
Date: Thu, 21 Sep 2017 12:22:42 -0700
Subject: [PATCH] Fixed comments total at /Admin/Blogs is always 0

Fixes #7838
---
 .../Orchard.Comments/Drivers/CommentsContainerPartDriver.cs  | 2 +-
 .../Modules/Orchard.Comments/Services/CommentService.cs      | 5 +++++
 .../Modules/Orchard.Comments/Services/ICommentService.cs     | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentsContainerPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentsContainerPartDriver.cs
index 9c067a9ec..85a1c3759 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentsContainerPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentsContainerPartDriver.cs
@@ -13,7 +13,7 @@ namespace Orchard.Comments.Drivers {
 
         protected override DriverResult Display(CommentsContainerPart part, string displayType, dynamic shapeHelper) {
 
-            var commentsForCommentedContent = _commentService.GetCommentsForCommentedContent(part.ContentItem.Id);
+            var commentsForCommentedContent = _commentService.GetCommentsForContainer(part.ContentItem.Id);
             Func<int> pendingCount = () => commentsForCommentedContent.Where(x => x.Status == CommentStatus.Pending).Count();
             Func<int> approvedCount = () => commentsForCommentedContent.Where(x => x.Status == CommentStatus.Approved).Count();
             
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Services/CommentService.cs b/src/Orchard.Web/Modules/Orchard.Comments/Services/CommentService.cs
index 02dd576f1..f61d10828 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Services/CommentService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Services/CommentService.cs
@@ -60,6 +60,11 @@ namespace Orchard.Comments.Services {
         public Localizer T { get; set; } 
         public ILogger Logger { get; set; }
 
+        public IContentQuery<CommentPart, CommentPartRecord> GetCommentsForContainer(int id) {
+            return GetComments()
+                .Where(c => c.CommentedOnContainer == id);
+        }
+
         public CommentPart GetComment(int id) {
             return _orchardServices.ContentManager.Get<CommentPart>(id);
         }
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Services/ICommentService.cs b/src/Orchard.Web/Modules/Orchard.Comments/Services/ICommentService.cs
index 30abd715c..dd96940ca 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Services/ICommentService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Services/ICommentService.cs
@@ -8,6 +8,7 @@ namespace Orchard.Comments.Services {
         IContentQuery<CommentPart, CommentPartRecord> GetComments(CommentStatus status);
         IContentQuery<CommentPart, CommentPartRecord> GetCommentsForCommentedContent(int id);
         IContentQuery<CommentPart, CommentPartRecord> GetCommentsForCommentedContent(int id, CommentStatus status);
+        IContentQuery<CommentPart, CommentPartRecord> GetCommentsForContainer(int id);
         CommentPart GetComment(int id);
         ContentItemMetadata GetDisplayForCommentedContent(int id);
         ContentItem GetCommentedContent(int id);