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

porting 7.6@5c5baca into 8

Browse Source
This commit is contained in:
Stephan
2017-05-30 10:50:09 +02:00
parent 13ec3db2d3
commit d34a425dd1
178 changed files with 3002 additions and 4131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,7 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(x => x.Snippet, exp => exp.Ignore());
config.CreateMap<CodeFileDisplay, IPartialView>()
.ForMember(x => x.DeletedDate, exp => exp.Ignore())
.ForMember(x => x.Id, exp => exp.Ignore())
.ForMember(x => x.Key, exp => exp.Ignore())
.ForMember(x => x.Path, exp => exp.Ignore())
@@ -40,6 +41,7 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(x => x.HasIdentity, exp => exp.Ignore());
config.CreateMap<CodeFileDisplay, Script>()
.ForMember(x => x.DeletedDate, exp => exp.Ignore())
.ForMember(x => x.Id, exp => exp.Ignore())
.ForMember(x => x.Key, exp => exp.Ignore())
.ForMember(x => x.Path, exp => exp.Ignore())

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

@@ -45,6 +45,7 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(type => type.Key, expression => expression.Ignore())
.ForMember(type => type.CreateDate, expression => expression.Ignore())
.ForMember(type => type.UpdateDate, expression => expression.Ignore())
.ForMember(type => type.DeletedDate, expression => expression.Ignore())
.ForMember(type => type.HasIdentity, expression => expression.Ignore());
config.CreateMap<DocumentTypeSave, IContentType>()
@@ -69,7 +70,7 @@ namespace Umbraco.Web.Models.Mapping
config.CreateMap<MediaTypeSave, IMediaType>()
//do the base mapping
.MapBaseContentTypeSaveToEntity<MediaTypeSave, PropertyTypeBasic, IMediaType>()
.ConstructUsing((source) => new MediaType(source.ParentId))
.ConstructUsing((source) => new MediaType(source.ParentId))
.AfterMap((source, dest) =>
{
ContentTypeModelMapperExtensions.AfterMapMediaTypeSaveToEntity(source, dest, _mediaTypeService);

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

@@ -32,6 +32,7 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(dest => dest.HasIdentity, map => map.Ignore())
.ForMember(dest => dest.CreateDate, map => map.Ignore())
.ForMember(dest => dest.UpdateDate, map => map.Ignore())
.ForMember(dest => dest.DeletedDate, map => map.Ignore())
.ForMember(dest => dest.PropertyTypes, map => map.Ignore());
}
@@ -172,6 +173,7 @@ namespace Umbraco.Web.Models.Mapping
//These get persisted as part of the saving procedure, nothing to do with the display model
.ForMember(dto => dto.CreateDate, expression => expression.Ignore())
.ForMember(dto => dto.UpdateDate, expression => expression.Ignore())
.ForMember(dto => dto.DeletedDate, expression => expression.Ignore())
.ForMember(dto => dto.AllowedAsRoot, expression => expression.MapFrom(display => display.AllowAsRoot))
.ForMember(dto => dto.CreatorId, expression => expression.Ignore())

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

@@ -113,6 +113,7 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(x => x.Level, expression => expression.Ignore())
.ForMember(x => x.SortOrder, expression => expression.Ignore())
.ForMember(x => x.CreateDate, expression => expression.Ignore())
.ForMember(x => x.DeletedDate, expression => expression.Ignore())
.ForMember(x => x.UpdateDate, expression => expression.Ignore());
//Converts a property editor to a new list of pre-value fields - used when creating a new data type or changing a data type with new pre-vals

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

@@ -67,8 +67,9 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(member => member.SortOrder, expression => expression.Ignore())
.ForMember(member => member.AdditionalData, expression => expression.Ignore())
.ForMember(member => member.FailedPasswordAttempts, expression => expression.Ignore())
//TODO: Support these eventually
.ForMember(member => member.PasswordQuestion, expression => expression.Ignore())
.ForMember(member => member.DeletedDate, expression => expression.Ignore())
//TODO: Support these eventually
.ForMember(member => member.PasswordQuestion, expression => expression.Ignore())
.ForMember(member => member.RawPasswordAnswerValue, expression => expression.Ignore());
//FROM IMember TO MediaItemDisplay

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

@@ -13,6 +13,7 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(x => x.Notifications, exp => exp.Ignore());
config.CreateMap<TemplateDisplay, Template>()
.ForMember(x => x.DeletedDate, exp => exp.Ignore())
.ForMember(x => x.Key, exp => exp.Ignore())
.ForMember(x => x.Path, exp => exp.Ignore())
.ForMember(x => x.CreateDate, exp => exp.Ignore())