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

map generic properties the right way

Browse Source
This commit is contained in:
Per Ploug
2015-06-08 18:17:10 +02:00
parent ddfd2fece4
commit e8abe4af2d
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,7 +36,6 @@ namespace Umbraco.Web.Models.Mapping
config.CreateMap<IMediaType, ContentTypeBasic>();
config.CreateMap<IContentType, ContentTypeBasic>();
config.CreateMap<ContentTypeDisplay, IContentType>()
.ConstructUsing((ContentTypeDisplay source) => new ContentType(source.ParentId))
@@ -56,7 +55,8 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(dto => dto.PropertyGroups, expression => expression.Ignore())
.AfterMap((source, dest) =>
{
foreach (var groupDisplay in source.Groups.Where(x => x.Name.IsNullOrWhiteSpace() == false ) )
//get all properties from groups that are not generic properties (-666 id)
foreach (var groupDisplay in source.Groups.Where(x => x.Id != -666))
{
//use underlying logic to add the property group which should wire most things up for us
dest.AddPropertyGroup(groupDisplay.Name);
@@ -70,6 +70,15 @@ namespace Umbraco.Web.Models.Mapping
//dest.PropertyGroups.Add(Mapper.Map<PropertyGroup>(groupDisplay));
}
//add generic properties
var genericProperties = source.Groups.FirstOrDefault(x => x.Id == -666);
if(genericProperties != null){
foreach (var propertyTypeDisplay in genericProperties.Properties)
{
dest.AddPropertyType(Mapper.Map<PropertyType>(propertyTypeDisplay));
}
}
//Sync allowed child types
var allowedTypes = source.AllowedContentTypes.Select((t, i) => new ContentTypeSort(t, i));