From 721c62f8d6c32725a4eec9e166e2ec28da78e82d Mon Sep 17 00:00:00 2001
From: Sebastien Ros <none@none>
Date: Thu, 28 Feb 2013 19:04:20 -0800
Subject: [PATCH] Improving Comments theming

--HG--
branch : 1.x
---
 .../Orchard.Comments/Drivers/CommentPartDriver.cs    |  1 -
 .../Orchard.Comments/Handlers/CommentsPartHandler.cs | 12 ++++++------
 .../Modules/Orchard.Comments/Placement.info          |  6 ------
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentPartDriver.cs
index 2e3898a13..24f20ec6b 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentPartDriver.cs
@@ -48,7 +48,6 @@ namespace Orchard.Comments.Drivers {
             });
             
             return Combined(
-                ContentShape("Parts_Comment", () => shapeHelper.Parts_Comment(FormattedText: formattedText.Value)),
                 ContentShape("Parts_Comment_SummaryAdmin", () => shapeHelper.Parts_Comment_SummaryAdmin(FormattedText: formattedText.Value))
                 );
         }
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Handlers/CommentsPartHandler.cs b/src/Orchard.Web/Modules/Orchard.Comments/Handlers/CommentsPartHandler.cs
index d6879d6f5..a830c88c9 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Handlers/CommentsPartHandler.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Handlers/CommentsPartHandler.cs
@@ -24,15 +24,15 @@ namespace Orchard.Comments.Handlers {
             });
 
             OnLoading<CommentsPart>((context, comments) => {
-                comments.CommentsField.Loader(list => contentManager
-                    .Query<CommentPart, CommentPartRecord>()
-                    .Where(x => x.CommentsPartRecord == context.ContentItem.As<CommentsPart>().Record && x.Status == CommentStatus.Approved)
+                comments.CommentsField.Loader(list =>
+                    commentService.GetCommentsForCommentedContent(context.ContentItem.Id)
+                    .Where(x => x.Status == CommentStatus.Approved)
                     .OrderBy(x => x.Position)
                     .List().ToList());
 
-                comments.PendingCommentsField.Loader(list => contentManager
-                    .Query<CommentPart, CommentPartRecord>()
-                    .Where(x => x.CommentsPartRecord == context.ContentItem.As<CommentsPart>().Record && x.Status == CommentStatus.Pending)
+                comments.PendingCommentsField.Loader(list => 
+                    commentService.GetCommentsForCommentedContent(context.ContentItem.Id)
+                    .Where(x => x.Status == CommentStatus.Pending)
                     .List().ToList());
             });
 
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Placement.info b/src/Orchard.Web/Modules/Orchard.Comments/Placement.info
index 46f10f637..7f32db6e3 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Placement.info
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Placement.info
@@ -22,12 +22,6 @@
     <Place Parts_CommentForm="Content:10.3" />
   </Match>
 
-  <Match ContentType="Comment" DisplayType="Summary">
-    <Place  Parts_Common_Metadata_Summary="-" 
-            Parts_Comment="Content:10"
-    />
-  </Match>
-
   <Match DisplayType="Summary">
     <Place Parts_Comments_Count="Meta:5" />
   </Match>