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

Merge branch temp8 into temp8-dirty-tracking-on-variants

Browse Source
This commit is contained in:
Stephan
2018-10-23 17:43:52 +02:00
parent 9320c1a061 e34728c10c
commit c0a1e7f2f6
162 changed files with 1741 additions and 1160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Web/Models/Mapping/ContentPropertyMapperProfile.cs
View File

@@ -24,7 +24,8 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(tab => tab.Label, expression => expression.MapFrom(@group => @group.Name))
.ForMember(tab => tab.IsActive, expression => expression.UseValue(true))
.ForMember(tab => tab.Properties, expression => expression.Ignore())
.ForMember(tab => tab.Alias, expression => expression.Ignore());
.ForMember(tab => tab.Alias, expression => expression.Ignore())
.ForMember(tab => tab.Expanded, expression => expression.Ignore());
//FROM Property TO ContentPropertyBasic
CreateMap<Property, ContentPropertyBasic>().ConvertUsing(contentPropertyBasicConverter);

9
src/Umbraco.Web/Models/Mapping/MemberMapperProfile.cs
View File

@@ -34,7 +34,7 @@ namespace Umbraco.Web.Models.Mapping
//FROM MembershipUser TO IMember - used when using a non-umbraco membership provider
CreateMap<MembershipUser, IMember>()
.ConstructUsing(src => MemberService.CreateGenericMembershipProviderMember(src.UserName, src.Email, src.UserName, ""))
//we're giving this entity an ID of 0 - we cannot really map it but it needs an id so the system knows it's not a new entity
//we're giving this entity an ID of int.MaxValue - TODO: SD: I can't remember why this mapping is here?
.ForMember(dest => dest.Id, opt => opt.MapFrom(src => int.MaxValue))
.ForMember(dest => dest.Comments, opt => opt.MapFrom(src => src.Comment))
.ForMember(dest => dest.CreateDate, opt => opt.MapFrom(src => src.CreationDate))
@@ -84,6 +84,8 @@ namespace Umbraco.Web.Models.Mapping
//FROM IMember TO MemberBasic
CreateMap<IMember, MemberBasic>()
//we're giving this entity an ID of int.MaxValue - this is kind of a hack to force angular to use the Key instead of the Id in list views
.ForMember(dest => dest.Id, opt => opt.MapFrom(src => int.MaxValue))
.ForMember(dest => dest.Udi, opt => opt.MapFrom(content => Udi.Create(Constants.UdiEntityType.Member, content.Key)))
.ForMember(dest => dest.Owner, opt => opt.ResolveUsing(src => memberOwnerResolver.Resolve(src)))
.ForMember(dest => dest.Icon, opt => opt.MapFrom(src => src.ContentType.Icon))
@@ -99,7 +101,7 @@ namespace Umbraco.Web.Models.Mapping
//FROM MembershipUser TO MemberBasic
CreateMap<MembershipUser, MemberBasic>()
//we're giving this entity an ID of 0 - we cannot really map it but it needs an id so the system knows it's not a new entity
//we're giving this entity an ID of int.MaxValue - TODO: SD: I can't remember why this mapping is here?
.ForMember(dest => dest.Id, opt => opt.MapFrom(src => int.MaxValue))
.ForMember(dest => dest.Udi, opt => opt.Ignore())
.ForMember(dest => dest.CreateDate, opt => opt.MapFrom(src => src.CreationDate))
@@ -142,8 +144,7 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(dest => dest.Icon, opt => opt.Ignore())
.ForMember(dest => dest.Trashed, opt => opt.Ignore())
.ForMember(dest => dest.ParentId, opt => opt.Ignore())
.ForMember(dest => dest.Alias, opt => opt.Ignore())
.ForMember(dest => dest.Path, opt => opt.Ignore());
.ForMember(dest => dest.Alias, opt => opt.Ignore());
}
}
}

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

@@ -71,7 +71,7 @@ namespace Umbraco.Web.Models.Mapping
}
else
{
var umbracoProvider = (IUmbracoMemberTypeMembershipProvider) provider;
var umbracoProvider = (IUmbracoMemberTypeMembershipProvider)provider;
//This is kind of a hack because a developer is supposed to be allowed to set their property editor - would have been much easier
// if we just had all of the membeship provider fields on the member table :(
@@ -112,11 +112,18 @@ namespace Umbraco.Web.Models.Mapping
protected override IEnumerable<ContentPropertyDisplay> GetCustomGenericProperties(IContentBase content)
{
var member = (IMember) content;
var member = (IMember)content;
var membersProvider = Core.Security.MembershipProviderExtensions.GetMembersMembershipProvider();
var genericProperties = new List<ContentPropertyDisplay>
{
new ContentPropertyDisplay
{
Alias = $"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}id",
Label = _localizedTextService.Localize("general/id"),
Value = new List<string> {member.Id.ToString(), member.Key.ToString()},
View = "idwithguid"
},
new ContentPropertyDisplay
{
Alias = $"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}doctype",