From 2ba7cdc7891e8d12ad04f243a9c526b8a6e782a2 Mon Sep 17 00:00:00 2001 From: Shannon Date: Thu, 19 Nov 2015 19:06:31 +0100 Subject: [PATCH 1/2] Fixes: U4-6659 Examine: Specific doctype not being indexed --- src/UmbracoExamine/BaseUmbracoIndexer.cs | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/UmbracoExamine/BaseUmbracoIndexer.cs b/src/UmbracoExamine/BaseUmbracoIndexer.cs index d5a9d6f233..ee77f5d05c 100644 --- a/src/UmbracoExamine/BaseUmbracoIndexer.cs +++ b/src/UmbracoExamine/BaseUmbracoIndexer.cs @@ -460,8 +460,19 @@ namespace UmbracoExamine if (xDoc != null) { var rootNode = xDoc.Root; - - AddNodesToIndex(rootNode.Elements(), type); + if (rootNode != null) + { + //the result will either be a single doc with an id as the root, or it will + // be multiple docs with a wrapper, we need to check for this + if (rootNode.HasAttributes) + { + AddNodesToIndex(new[] {rootNode}, type); + } + else + { + AddNodesToIndex(rootNode.Elements(), type); + } + } } } From 22eea2b7db3d5984dcd62dc8fad931540bffb34c Mon Sep 17 00:00:00 2001 From: Stephan Date: Thu, 3 Dec 2015 12:56:19 +0100 Subject: [PATCH 2/2] Fix tests --- .../Models/Mapping/ContentTypeModelMapperExtensions.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Umbraco.Web/Models/Mapping/ContentTypeModelMapperExtensions.cs b/src/Umbraco.Web/Models/Mapping/ContentTypeModelMapperExtensions.cs index 2641216394..9178d69d8f 100644 --- a/src/Umbraco.Web/Models/Mapping/ContentTypeModelMapperExtensions.cs +++ b/src/Umbraco.Web/Models/Mapping/ContentTypeModelMapperExtensions.cs @@ -121,6 +121,8 @@ namespace Umbraco.Web.Models.Mapping //ignore, we'll do this in after map .ForMember(dto => dto.PropertyGroups, expression => expression.Ignore()) .ForMember(dto => dto.NoGroupPropertyTypes, expression => expression.Ignore()) + // ignore, composition is managed in AfterMapContentTypeSaveToEntity + .ForMember(dest => dest.ContentTypeComposition, opt => opt.Ignore()) .ForMember( dto => dto.AllowedContentTypes,