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

fixes mappings with change to allowed content types with enumerable int's. Fixes up a mapping to not do ToArray() and consuming more memory than required

Browse Source
This commit is contained in:
Shannon
2015-06-05 12:09:20 +02:00
parent d797677879
commit c9cb7034f8
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,10 +63,7 @@ namespace Umbraco.Web.Models.Mapping
}
//Sync allowed child types
var allowedTypes = new List<ContentTypeSort>();
var proposedAllowed = source.AllowedContentTypes.ToArray();
for (int i = 0; i < proposedAllowed.Length; i++)
allowedTypes.Add(new ContentTypeSort(proposedAllowed[i], i));
var allowedTypes = source.AllowedContentTypes.Select((t, i) => new ContentTypeSort(t, i));
dest.AllowedContentTypes = allowedTypes;
@@ -121,11 +118,7 @@ namespace Umbraco.Web.Models.Mapping
.AfterMap((source, dest) =>
{
//do allowed content types, we need to look them up then assign to a list of entity basic,
//we are doing this manually because ContentTypeSort doesnt have a Name and we want that
var foundCts = applicationContext.Services.ContentTypeService
.GetAllContentTypes(source.AllowedContentTypes.Select(x => Convert.ToInt32(x.Id)).ToArray());
dest.AllowedContentTypes = foundCts.Select(Mapper.Map<EntityBasic>);
dest.AllowedContentTypes = source.AllowedContentTypes.Select(x => x.Id.Value);
});

5
src/Umbraco.Web/Models/Mapping/EntityModelMapper.cs
View File

@@ -52,11 +52,6 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(dto => dto.Trashed, expression => expression.Ignore())
.ForMember(x => x.AdditionalData, expression => expression.Ignore());
config.CreateMap<IContentType, EntityBasic>()
.ForMember(basic => basic.Icon, expression => expression.UseValue("icon-grid"))
.ForMember(dto => dto.Trashed, expression => expression.Ignore())
.ForMember(x => x.AdditionalData, expression => expression.Ignore());
config.CreateMap<EntityBasic, ITemplate>()
.ConstructUsing(basic => new Template(basic.Name, basic.Alias)
{