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

Merge origin/dev-v7-deploy into dev-v8-zbwip

Browse Source
This commit is contained in:
Stephan
2016-11-04 18:40:42 +01:00
parent a4c3d3ec2d 8fa1499a2f
commit c6e4e3b3ed
64 changed files with 6702 additions and 803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,7 +89,7 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(display => display.Tabs,
expression => expression.ResolveUsing(new MemberTabsAndPropertiesResolver(_textService)))
.ForMember(display => display.MemberProviderFieldMapping,
expression => expression.ResolveUsing<MemberProviderFieldMappingResolver>())
expression => expression.ResolveUsing(new MemberProviderFieldMappingResolver()))
.ForMember(display => display.MembershipScenario,
expression => expression.ResolveUsing(new MembershipScenarioMappingResolver(new Lazy<IMemberTypeService>(() => _memberTypeService))))
.ForMember(display => display.Notifications, expression => expression.Ignore())
@@ -170,7 +170,7 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(x => x.Alias, expression => expression.Ignore())
.ForMember(member => member.HasPublishedVersion, expression => expression.Ignore())
//do no map the custom member properties (currently anyways, they were never there in 6.x)
.ForMember(dto => dto.Properties, expression => expression.ResolveUsing<MemberDtoPropertiesValueResolver>());
.ForMember(dto => dto.Properties, expression => expression.ResolveUsing(new MemberDtoPropertiesValueResolver()));
//FROM IMemberGroup TO MemberGroupDisplay
config.CreateMap<IMemberGroup, MemberGroupDisplay>()