From 03fb3b4bafcf5a51f0f0439b5a600578247b7c25 Mon Sep 17 00:00:00 2001
From: Sebastien Ros <none@none>
Date: Tue, 20 Mar 2012 17:29:18 -0700
Subject: [PATCH] #18548: Fixing custom DisplayText metadata

Work Item: 18548

--HG--
branch : 1.x
---
 .../Core/Title/Handlers/TitlePartHandler.cs    | 12 +++++++++++-
 .../Handlers/WidgetPartHandler.cs              |  6 +++++-
 .../Handlers/TitleAspectHandler.cs             | 18 ------------------
 src/Orchard/Orchard.Framework.csproj           |  1 -
 4 files changed, 16 insertions(+), 21 deletions(-)
 delete mode 100644 src/Orchard/ContentManagement/Handlers/TitleAspectHandler.cs

diff --git a/src/Orchard.Web/Core/Title/Handlers/TitlePartHandler.cs b/src/Orchard.Web/Core/Title/Handlers/TitlePartHandler.cs
index d8733362c..639c8334f 100644
--- a/src/Orchard.Web/Core/Title/Handlers/TitlePartHandler.cs
+++ b/src/Orchard.Web/Core/Title/Handlers/TitlePartHandler.cs
@@ -1,4 +1,5 @@
-using Orchard.ContentManagement.Handlers;
+using Orchard.ContentManagement;
+using Orchard.ContentManagement.Handlers;
 using Orchard.Core.Title.Models;
 using Orchard.Data;
 
@@ -7,6 +8,15 @@ namespace Orchard.Core.Title.Handlers {
 
         public TitlePartHandler(IRepository<TitlePartRecord> repository) {
             Filters.Add(StorageFilter.For(repository));
+            OnIndexing<TitlePart>((context, part) => context.DocumentIndex.Add("title", part.Title).RemoveTags().Analyze());
+        }
+
+        protected override void GetItemMetadata(GetContentItemMetadataContext context) {
+            var part = context.ContentItem.As<TitlePart>();
+
+            if (part != null) {
+                context.Metadata.DisplayText = part.Title;
+            }
         }
     }
 }
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Handlers/WidgetPartHandler.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Handlers/WidgetPartHandler.cs
index 4fe0c6e9d..af0b9a748 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Handlers/WidgetPartHandler.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Handlers/WidgetPartHandler.cs
@@ -2,6 +2,7 @@
 using JetBrains.Annotations;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Handlers;
+using Orchard.Core.Title.Models;
 using Orchard.Data;
 using Orchard.Widgets.Models;
 
@@ -11,7 +12,8 @@ namespace Orchard.Widgets.Handlers {
         public WidgetPartHandler(IRepository<WidgetPartRecord> widgetsRepository) {
             Filters.Add(StorageFilter.For(widgetsRepository));
 
-            OnInitializing<WidgetPart>((context, part) => part.RenderTitle = true); 
+            OnInitializing<WidgetPart>((context, part) => part.RenderTitle = true);
+            OnIndexing<TitlePart>((context, part) => context.DocumentIndex.Add("title", part.Title).RemoveTags().Analyze());
         }
 
         protected override void GetItemMetadata(GetContentItemMetadataContext context) {
@@ -20,6 +22,8 @@ namespace Orchard.Widgets.Handlers {
             if (widget == null)
                 return;
 
+            context.Metadata.DisplayText = widget.Title;
+
             // create needs to go through the add widget flow (index -> [select layer -> ] add [widget type] to layer)
             context.Metadata.CreateRouteValues = new RouteValueDictionary {
                 {"Area", "Orchard.Widgets"},
diff --git a/src/Orchard/ContentManagement/Handlers/TitleAspectHandler.cs b/src/Orchard/ContentManagement/Handlers/TitleAspectHandler.cs
deleted file mode 100644
index 57add5b76..000000000
--- a/src/Orchard/ContentManagement/Handlers/TitleAspectHandler.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Orchard.ContentManagement.Aspects;
-
-namespace Orchard.ContentManagement.Handlers {
-    public class TitlePartHandler : ContentHandler {
-
-        public TitlePartHandler() {
-            OnIndexing<ITitleAspect>((context, part) => context.DocumentIndex.Add("title", part.Title).RemoveTags().Analyze());
-        }
-
-        protected override void GetItemMetadata(GetContentItemMetadataContext context) {
-            var part = context.ContentItem.As<ITitleAspect>();
-
-            if (part != null) {
-                context.Metadata.DisplayText = part.Title;
-            }
-        }
-    }
-}
diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj
index a17d8f1c5..14860e7a0 100644
--- a/src/Orchard/Orchard.Framework.csproj
+++ b/src/Orchard/Orchard.Framework.csproj
@@ -161,7 +161,6 @@
     <Compile Include="ContentManagement\Handlers\BuildShapeContext.cs" />
     <Compile Include="ContentManagement\Handlers\ExportContentContext.cs" />
     <Compile Include="ContentManagement\Handlers\ImportContentContext.cs" />
-    <Compile Include="ContentManagement\Handlers\TitleAspectHandler.cs" />
     <Compile Include="ContentManagement\IContentBehavior.cs" />
     <Compile Include="ContentManagement\ImportContentSession.cs" />
     <Compile Include="ContentManagement\MetaData\Services\ISettingsFormatter.cs" />