diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs index 773d440e1..c2872c8dc 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs @@ -180,13 +180,13 @@ namespace Orchard.Blogs.Controllers { if (blogPart == null) return HttpNotFound(); - var blogPosts = _blogPostService.Get(blogPart, pager.GetStartIndex(), pager.PageSize, VersionOptions.Latest) - .Select(bp => _contentManager.BuildDisplay(bp, "SummaryAdmin")); + var blogPosts = _blogPostService.Get(blogPart, pager.GetStartIndex(), pager.PageSize, VersionOptions.Latest).ToArray(); + var blogPostsShapes = blogPosts.Select(bp => _contentManager.BuildDisplay(bp, "SummaryAdmin")).ToArray(); dynamic blog = Services.ContentManager.BuildDisplay(blogPart, "DetailAdmin"); var list = Shape.List(); - list.AddRange(blogPosts); + list.AddRange(blogPostsShapes); blog.Content.Add(Shape.Parts_Blogs_BlogPost_ListAdmin(ContentItems: list), "5"); var totalItemCount = _blogPostService.PostCount(blogPart, VersionOptions.Latest); diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentsPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentsPartDriver.cs index 22d0cb477..e66ea673c 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentsPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentsPartDriver.cs @@ -18,14 +18,16 @@ namespace Orchard.Comments.Drivers { if (part.CommentsShown == false) return null; + var commentsForCommentedContent = _commentService.GetCommentsForCommentedContent(part.ContentItem.Id); + return Combined( ContentShape("Parts_Comments", () => shapeHelper.Parts_Comments(ContentPart: part)), ContentShape("Parts_Comments_Count", - () => shapeHelper.Parts_Comments_Count(ContentPart: part, CommentCount: _commentService.GetCommentsForCommentedContent(part.ContentItem.Id).Count(), PendingCount: part.PendingComments.Count)), + () => shapeHelper.Parts_Comments_Count(ContentPart: part, CommentCount: commentsForCommentedContent.Count(), PendingCount: commentsForCommentedContent.Where(x => x.Status == CommentStatus.Pending).Count())), ContentShape("Parts_Comments_Count_SummaryAdmin", - () => shapeHelper.Parts_Comments_Count_SummaryAdmin(ContentPart: part, CommentCount: _commentService.GetCommentsForCommentedContent(part.ContentItem.Id).Count(), PendingCount: part.PendingComments.Count)) - ); + () => shapeHelper.Parts_Comments_Count_SummaryAdmin(ContentPart: part, CommentCount: commentsForCommentedContent.Count(), PendingCount: commentsForCommentedContent.Where(x => x.Status == CommentStatus.Pending).Count())) + ); } protected override DriverResult Editor(CommentsPart part, dynamic shapeHelper) { diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Models/CommentsPartRecord.cs b/src/Orchard.Web/Modules/Orchard.Comments/Models/CommentsPartRecord.cs index 972178c31..9a1f00d2e 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Models/CommentsPartRecord.cs +++ b/src/Orchard.Web/Modules/Orchard.Comments/Models/CommentsPartRecord.cs @@ -4,6 +4,10 @@ using Orchard.Data.Conventions; namespace Orchard.Comments.Models { public class CommentsPartRecord : ContentPartRecord { + public CommentsPartRecord() { + CommentPartRecords = new List(); + } + public virtual bool CommentsShown { get; set; } public virtual bool CommentsActive { get; set; } diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Placement.info b/src/Orchard.Web/Modules/Orchard.Comments/Placement.info index f6682d551..b8799ff13 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Placement.info +++ b/src/Orchard.Web/Modules/Orchard.Comments/Placement.info @@ -16,6 +16,6 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.Comments.Count.SummaryAdmin.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.Comments.Count.SummaryAdmin.cshtml index 2a8bea8af..b544f7fdf 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.Comments.Count.SummaryAdmin.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.Comments.Count.SummaryAdmin.cshtml @@ -1,4 +1,6 @@ -@using Orchard.Comments.Models; -@using Orchard.Comments.ViewModels; -@using Orchard.ContentManagement; -@Display.CommentSummaryLinks(item: Model.ContentPart.ContentItem, count: Model.CommentCount, pendingCount: Model.PendingCount)@T(" | ") \ No newline at end of file + \ No newline at end of file