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

DataType refactoring preparation - Entity refactoring

Browse Source
This commit is contained in:
Stephan
2018-01-12 10:48:36 +01:00
parent b5856803e1
commit 988aa661ea
20 changed files with 337 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web/Models/Mapping/ContentTypeMapperProfile.cs
View File

@@ -183,7 +183,7 @@ namespace Umbraco.Web.Models.Mapping
// see note above - have to do this here?
.ForMember(dest => dest.PropertyEditorAlias, opt => opt.Ignore())
.ForMember(dest => dest.DeletedDate, opt => opt.Ignore())
.ForMember(dest => dest.DeleteDate, opt => opt.Ignore())
.ForMember(dto => dto.Variations, opt => opt.Ignore()) // fixme - change when UI supports it!

2
src/Umbraco.Web/Models/Mapping/ContentTypeProfileExtensions.cs
View File

@@ -30,7 +30,7 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(dest => dest.Id, map => map.Condition(src => src.Id > 0))
.ForMember(dest => dest.Key, map => map.Ignore())
.ForMember(dest => dest.HasIdentity, map => map.Ignore())
.ForMember(dest => dest.DeletedDate, map => map.Ignore())
.ForMember(dest => dest.DeleteDate, map => map.Ignore())
.ForMember(dest => dest.PropertyTypes, map => map.Ignore());
}

16
src/Umbraco.Web/Models/Mapping/EntityMapperProfile.cs
View File

@@ -21,13 +21,13 @@ namespace Umbraco.Web.Models.Mapping
var contentTypeUdiResolver = new ContentTypeUdiResolver();
CreateMap<UmbracoEntity, EntityBasic>()
.ForMember(dest => dest.Udi, opt => opt.MapFrom(src => Udi.Create(UmbracoObjectTypesExtensions.GetUdiType(src.NodeObjectTypeId), src.Key)))
.ForMember(dest => dest.Udi, opt => opt.MapFrom(src => Udi.Create(UmbracoObjectTypesExtensions.GetUdiType(src.NodeObjectType), src.Key)))
.ForMember(dest => dest.Icon, opt => opt.MapFrom(src => src.ContentTypeIcon))
.ForMember(dest => dest.Trashed, opt => opt.Ignore())
.ForMember(dest => dest.Alias, opt => opt.Ignore())
.AfterMap((src, dest) =>
{
if (src.NodeObjectTypeId == Constants.ObjectTypes.Member && dest.Icon.IsNullOrWhiteSpace())
if (src.NodeObjectType == Constants.ObjectTypes.Member && dest.Icon.IsNullOrWhiteSpace())
{
dest.Icon = "icon-user";
}
@@ -80,7 +80,7 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(dest => dest.AdditionalData, opt => opt.Ignore());
CreateMap<UmbracoEntity, SearchResultItem>()
.ForMember(dest => dest.Udi, opt => opt.MapFrom(src => Udi.Create(UmbracoObjectTypesExtensions.GetUdiType(src.NodeObjectTypeId), src.Key)))
.ForMember(dest => dest.Udi, opt => opt.MapFrom(src => Udi.Create(UmbracoObjectTypesExtensions.GetUdiType(src.NodeObjectType), src.Key)))
.ForMember(dest => dest.Icon, opt => opt.MapFrom(src=> src.ContentTypeIcon))
.ForMember(dest => dest.Trashed, opt => opt.Ignore())
.ForMember(dest => dest.Alias, opt => opt.Ignore())
@@ -89,15 +89,15 @@ namespace Umbraco.Web.Models.Mapping
{
if (basic.Icon.IsNullOrWhiteSpace())
{
if (entity.NodeObjectTypeId == Constants.ObjectTypes.Member)
if (entity.NodeObjectType == Constants.ObjectTypes.Member)
basic.Icon = "icon-user";
else if (entity.NodeObjectTypeId == Constants.ObjectTypes.DataType)
else if (entity.NodeObjectType == Constants.ObjectTypes.DataType)
basic.Icon = "icon-autofill";
else if (entity.NodeObjectTypeId == Constants.ObjectTypes.DocumentType)
else if (entity.NodeObjectType == Constants.ObjectTypes.DocumentType)
basic.Icon = "icon-item-arrangement";
else if (entity.NodeObjectTypeId == Constants.ObjectTypes.MediaType)
else if (entity.NodeObjectType == Constants.ObjectTypes.MediaType)
basic.Icon = "icon-thumbnails";
else if (entity.NodeObjectTypeId == Constants.ObjectTypes.TemplateType)
else if (entity.NodeObjectType == Constants.ObjectTypes.TemplateType)
basic.Icon = "icon-newspaper-alt";
}
});

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

@@ -157,14 +157,14 @@ namespace Umbraco.Web.Models.Mapping
});
CreateMap<UmbracoEntity, AssignedContentPermissions>()
.ForMember(x => x.Udi, opt => opt.MapFrom(x => Udi.Create(UmbracoObjectTypesExtensions.GetUdiType(x.NodeObjectTypeId), x.Key)))
.ForMember(x => x.Udi, opt => opt.MapFrom(x => Udi.Create(UmbracoObjectTypesExtensions.GetUdiType(x.NodeObjectType), x.Key)))
.ForMember(basic => basic.Icon, opt => opt.MapFrom(entity => entity.ContentTypeIcon))
.ForMember(dto => dto.Trashed, opt => opt.Ignore())
.ForMember(x => x.Alias, opt => opt.Ignore())
.ForMember(x => x.AssignedPermissions, opt => opt.Ignore())
.AfterMap((entity, basic) =>
{
if (entity.NodeObjectTypeId == Constants.ObjectTypes.Member && basic.Icon.IsNullOrWhiteSpace())
if (entity.NodeObjectType == Constants.ObjectTypes.Member && basic.Icon.IsNullOrWhiteSpace())
{
basic.Icon = "icon-user";
}