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

Fixes remaining tests

Browse Source
This commit is contained in:
Shannon
2014-09-25 13:52:16 +10:00
parent 88f79cfca5
commit 23b214e4f9
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs
View File

@@ -48,6 +48,7 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(display => display.Published, expression => expression.Ignore())
.ForMember(display => display.Updater, expression => expression.Ignore())
.ForMember(display => display.Alias, expression => expression.Ignore())
.ForMember(display => display.IsContainer, expression => expression.Ignore())
.ForMember(display => display.Tabs, expression => expression.ResolveUsing<TabsAndPropertiesResolver>())
.AfterMap((media, display) => AfterMap(media, display, applicationContext.Services.DataTypeService));

14
src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs
View File

@@ -85,6 +85,9 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(display => display.Published, expression => expression.Ignore())
.ForMember(display => display.Updater, expression => expression.Ignore())
.ForMember(display => display.Alias, expression => expression.Ignore())
.ForMember(display => display.IsChildOfListView, expression => expression.Ignore())
.ForMember(display => display.IsContainer, expression => expression.Ignore())
.ForMember(display => display.TreeNodeUrl, expression => expression.Ignore())
.AfterMap((member, display) => MapGenericCustomProperties(applicationContext.Services.MemberService, member, display));
//FROM IMember TO MemberBasic
@@ -111,13 +114,13 @@ namespace Umbraco.Web.Models.Mapping
//FROM MembershipUser TO MemberBasic
config.CreateMap<MembershipUser, MemberBasic>()
//we're giving this entity an ID - we cannot really map it but it needs an id so the system knows it's not a new entity
.ForMember(member => member.Id, expression => expression.MapFrom(user => int.MaxValue))
.ForMember(member => member.Id, expression => expression.MapFrom(user => int.MaxValue))
.ForMember(member => member.CreateDate, expression => expression.MapFrom(user => user.CreationDate))
.ForMember(member => member.UpdateDate, expression => expression.MapFrom(user => user.LastActivityDate))
.ForMember(member => member.UpdateDate, expression => expression.MapFrom(user => user.LastActivityDate))
.ForMember(member => member.Key, expression => expression.MapFrom(user => user.ProviderUserKey.TryConvertTo<Guid>().Result.ToString("N")))
.ForMember(
dto => dto.Owner,
expression => expression.UseValue(new UserBasic { Name = "Admin", UserId = 0 }))
expression => expression.UseValue(new UserBasic {Name = "Admin", UserId = 0}))
.ForMember(
dto => dto.Icon,
expression => expression.UseValue("icon-user"))
@@ -132,10 +135,11 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(member => member.ParentId, expression => expression.Ignore())
.ForMember(member => member.Path, expression => expression.Ignore())
.ForMember(member => member.SortOrder, expression => expression.Ignore())
.ForMember(member => member.AdditionalData, expression => expression.Ignore())
.ForMember(member => member.AdditionalData, expression => expression.Ignore())
.ForMember(x => x.Published, expression => expression.Ignore())
.ForMember(x => x.Updater, expression => expression.Ignore())
.ForMember(x => x.Alias, expression => expression.Ignore());
.ForMember(x => x.Alias, expression => expression.Ignore())
.ForMember(x => x.ContentTypeAlias, expression => expression.Ignore());
//FROM IMember TO ContentItemDto<IMember>
config.CreateMap<IMember, ContentItemDto<IMember>>()