From e580bfef97045a71af5417bac84ea6accf68ceb9 Mon Sep 17 00:00:00 2001 From: Shannon Date: Fri, 5 Jun 2015 12:13:40 +0200 Subject: [PATCH] moves mapping for allowed content types to be inline, no need for after map for that --- .../Models/Mapping/ContentTypeModelMapper.cs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs index cd2b47793e..5e3e6c2ec2 100644 --- a/src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs +++ b/src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs @@ -98,8 +98,11 @@ namespace Umbraco.Web.Models.Mapping .ForMember(display => display.AllowAsRoot, expression => expression.MapFrom(type => type.AllowedAsRoot)) //Ignore because this is not actually used for content types .ForMember(display => display.Trashed, expression => expression.Ignore()) - //Ignore, we'll do this in after map - .ForMember(dto => dto.AllowedContentTypes, expression => expression.Ignore()) + + .ForMember( + dto => dto.AllowedContentTypes, + expression => expression.MapFrom(dto => dto.AllowedContentTypes.Select(x => x.Id.Value))) + .ForMember( dto => dto.AvailableCompositeContentTypes, expression => expression.ResolveUsing(new AvailableCompositeContentTypesResolver(applicationContext))) @@ -114,13 +117,7 @@ namespace Umbraco.Web.Models.Mapping .ForMember( dto => dto.Groups, - expression => expression.ResolveUsing(new PropertyTypeGroupResolver(applicationContext, _propertyEditorResolver))) - - .AfterMap((source, dest) => - { - dest.AllowedContentTypes = source.AllowedContentTypes.Select(x => x.Id.Value); - }); - + expression => expression.ResolveUsing(new PropertyTypeGroupResolver(applicationContext, _propertyEditorResolver))); config.CreateMap() .ForMember(dest => dest.Id, expression => expression.Condition(source => source.Id > 0))