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

fixes unit test

Browse Source
This commit is contained in:
Shannon
2014-10-03 17:07:27 +10:00
parent cc9ca02843
commit 58a0de086f
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,12 +17,14 @@ namespace Umbraco.Web.Models.Mapping
{
config.CreateMap<UmbracoEntity, EntityBasic>()
.ForMember(basic => basic.Icon, expression => expression.MapFrom(entity => entity.ContentTypeIcon))
.ForMember(dto => dto.Trashed, expression => expression.Ignore())
.ForMember(x => x.Alias, expression => expression.Ignore());
config.CreateMap<PropertyType, EntityBasic>()
.ForMember(basic => basic.Icon, expression => expression.UseValue("icon-box"))
.ForMember(basic => basic.Path, expression => expression.UseValue(""))
.ForMember(basic => basic.ParentId, expression => expression.UseValue(-1))
.ForMember(dto => dto.Trashed, expression => expression.Ignore())
.ForMember(x => x.AdditionalData, expression => expression.Ignore());
config.CreateMap<PropertyGroup, EntityBasic>()
@@ -31,6 +33,7 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(basic => basic.ParentId, expression => expression.UseValue(-1))
//in v6 the 'alias' is it's lower cased name so we'll stick to that.
.ForMember(basic => basic.Alias, expression => expression.MapFrom(group => group.Name.ToLowerInvariant()))
.ForMember(dto => dto.Trashed, expression => expression.Ignore())
.ForMember(x => x.AdditionalData, expression => expression.Ignore());
config.CreateMap<IUser, EntityBasic>()
@@ -38,6 +41,7 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(basic => basic.Path, expression => expression.UseValue(""))
.ForMember(basic => basic.ParentId, expression => expression.UseValue(-1))
.ForMember(basic => basic.Alias, expression => expression.MapFrom(user => user.Username))
.ForMember(dto => dto.Trashed, expression => expression.Ignore())
.ForMember(x => x.AdditionalData, expression => expression.Ignore());
config.CreateMap<SearchResult, EntityBasic>()
@@ -49,6 +53,7 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(x => x.ParentId, expression => expression.Ignore())
.ForMember(x => x.Alias, expression => expression.Ignore())
.ForMember(x => x.Path, expression => expression.Ignore())
.ForMember(dto => dto.Trashed, expression => expression.Ignore())
.ForMember(x => x.AdditionalData, expression => expression.Ignore())
.AfterMap((result, basic) =>
{