yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moves mapping for allowed content types to be inline, no need for after map for that

Browse Source
This commit is contained in:
Shannon
2015-06-05 12:13:40 +02:00
parent c9cb7034f8
commit e580bfef97
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs
View File

@@ -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<PropertyGroupDisplay, PropertyGroup>()
.ForMember(dest => dest.Id, expression => expression.Condition(source => source.Id > 0))