[#449] [9.1] Update to use enhanced AllTemplates builtin computed fie…

…ld instead of custom version
Sitecore · Nov 27, 2018 · c671575 · c671575
1 parent 17b8955
commit c671575
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 53 deletions.
diff --git a/src/Foundation/Indexing/code/App_Config/Include/Foundation/Foundation.Indexing.config b/src/Foundation/Indexing/code/App_Config/Include/Foundation/Foundation.Indexing.config
@@ -18,7 +18,6 @@
                 <defaultSolrIndexConfiguration type="Sitecore.ContentSearch.SolrProvider.SolrIndexConfiguration, Sitecore.ContentSearch.SolrProvider">
                     <fieldMap type="Sitecore.ContentSearch.SolrProvider.SolrFieldMap, Sitecore.ContentSearch.SolrProvider">
                         <fieldNames hint="raw:AddFieldByFieldName">
-                            <field fieldName="all_templates" returnType="stringCollection" />
                             <field fieldName="has_presentation" returnType="bool" />
                             <field fieldName="has_search_result_formatter" returnType="bool" />
                             <field fieldName="search_result_formatter" returnType="string" />
@@ -32,7 +31,7 @@
                     <documentOptions type="Sitecore.ContentSearch.SolrProvider.SolrDocumentBuilderOptions, Sitecore.ContentSearch.SolrProvider">
                         <fields hint="raw:AddComputedIndexField">
                             <field fieldName="has_presentation" storageType="no" indexType="untokenized">Sitecore.Foundation.Indexing.Infrastructure.Fields.HasPresentationComputedField, Sitecore.Foundation.Indexing</field>
-                            <field fieldName="all_templates" storageType="no" indexType="untokenized">Sitecore.Foundation.Indexing.Infrastructure.Fields.AllTemplatesComputedField, Sitecore.Foundation.Indexing</field>
+                            <field fieldName="_templates" returnType="string" type="Sitecore.ContentSearch.ComputedFields.AllTemplates, Sitecore.ContentSearch" deep="true" includeStandardTemplate="false" />
                             <field fieldName="has_search_result_formatter" storageType="no" indexType="untokenized">Sitecore.Foundation.Indexing.Infrastructure.Fields.HasSearchResultFormatterComputedField, Sitecore.Foundation.Indexing</field>
                             <field fieldName="search_result_formatter" storageType="no" indexType="untokenized">Sitecore.Foundation.Indexing.Infrastructure.Fields.SearchResultFormatterComputedField, Sitecore.Foundation.Indexing</field>
                         </fields>

diff --git a/src/Foundation/Indexing/code/Constants.cs b/src/Foundation/Indexing/code/Constants.cs
@@ -5,7 +5,7 @@ public struct Constants
         public struct IndexFields
         {
             public const string HasPresentation = "has_presentation";
-            public const string AllTemplates = "all_templates";
+            public const string AllTemplates = "_templates";
             public const string IsLatestVersion = "_latestversion";
             public const string HasSearchResultFormatter = "has_search_result_formatter";
             public const string ContentType = "content_type";

diff --git a/src/Foundation/Indexing/code/Infrastructure/Fields/AllTemplatesComputedField.cs b/src/Foundation/Indexing/code/Infrastructure/Fields/AllTemplatesComputedField.cs
diff --git a/src/Foundation/Indexing/code/Sitecore.Foundation.Indexing.csproj b/src/Foundation/Indexing/code/Sitecore.Foundation.Indexing.csproj
@@ -146,7 +146,6 @@
     <Compile Include="Services\GetFreeTextPredicateService.cs" />
     <Compile Include="Infrastructure\Fields\HasSearchResultFormatterComputedField.cs" />
     <Compile Include="Repositories\IndexingProviderRepository.cs" />
-    <Compile Include="Infrastructure\Fields\AllTemplatesComputedField.cs" />
     <Compile Include="Infrastructure\Fields\HasPresentationComputedField.cs" />
     <Compile Include="Models\IQueryPredicateProvider.cs" />
     <Compile Include="Models\ISearchResultFormatter.cs" />