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

Fixed the mapping for HasPublishedVersion

Browse Source
This commit is contained in:
Sebastiaan Janssen
2016-08-04 12:18:27 +02:00
parent d8f68f5f9b
commit b7264b58f9
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
View File

@@ -56,6 +56,9 @@ namespace Umbraco.Web.Models.Mapping
expression => expression.MapFrom(content => GetPublishedDate(content, applicationContext)))
.ForMember(
dto => dto.TemplateAlias, expression => expression.MapFrom(content => content.Template.Alias))
.ForMember(
dto => dto.HasPublishedVersion,
expression => expression.MapFrom(content => content.HasPublishedVersion))
.ForMember(
dto => dto.Urls,
expression => expression.MapFrom(content =>
@@ -87,7 +90,7 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(
dto => dto.Trashed,
expression => expression.MapFrom(content => content.Trashed))
.ForMember(
.ForMember(
dto => dto.HasPublishedVersion,
expression => expression.MapFrom(content => content.HasPublishedVersion))
.ForMember(
@@ -100,6 +103,9 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(
dto => dto.Owner,
expression => expression.ResolveUsing<OwnerResolver<IContent>>())
.ForMember(
dto => dto.HasPublishedVersion,
expression => expression.MapFrom(content => content.HasPublishedVersion))
.ForMember(display => display.Updater, expression => expression.Ignore())
.ForMember(display => display.Icon, expression => expression.Ignore())
.ForMember(display => display.Alias, expression => expression.Ignore());

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

@@ -53,6 +53,7 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(display => display.Updater, expression => expression.Ignore())
.ForMember(display => display.Alias, expression => expression.Ignore())
.ForMember(display => display.IsContainer, expression => expression.Ignore())
.ForMember(member => member.HasPublishedVersion, expression => expression.Ignore())
.ForMember(display => display.Tabs, expression => expression.ResolveUsing(new TabsAndPropertiesResolver(applicationContext.Services.TextService)))
.AfterMap((media, display) => AfterMap(media, display, applicationContext.Services.DataTypeService, applicationContext.Services.TextService, applicationContext.ProfilingLogger.Logger));
@@ -72,7 +73,8 @@ namespace Umbraco.Web.Models.Mapping
expression => expression.MapFrom(content => content.ContentType.Alias))
.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(member => member.HasPublishedVersion, expression => expression.Ignore());
//FROM IMedia TO ContentItemDto<IMedia>
config.CreateMap<IMedia, ContentItemDto<IMedia>>()
@@ -82,7 +84,8 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(x => x.Published, expression => expression.Ignore())
.ForMember(x => x.Updater, expression => expression.Ignore())
.ForMember(x => x.Icon, expression => expression.Ignore())
.ForMember(x => x.Alias, expression => expression.Ignore());
.ForMember(x => x.Alias, expression => expression.Ignore())
.ForMember(member => member.HasPublishedVersion, expression => expression.Ignore());
}
private static void AfterMap(IMedia media, MediaItemDisplay display, IDataTypeService dataTypeService, ILocalizedTextService localizedText, ILogger logger)

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

@@ -90,6 +90,7 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(display => display.Trashed, expression => expression.Ignore())
.ForMember(display => display.IsContainer, expression => expression.Ignore())
.ForMember(display => display.TreeNodeUrl, expression => expression.Ignore())
.ForMember(member => member.HasPublishedVersion, expression => expression.Ignore())
.AfterMap((member, display) => MapGenericCustomProperties(applicationContext.Services.MemberService, member, display, applicationContext.Services.TextService));
//FROM IMember TO MemberBasic
@@ -112,7 +113,8 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(display => display.Trashed, 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(member => member.HasPublishedVersion, expression => expression.Ignore());
//FROM MembershipUser TO MemberBasic
config.CreateMap<MembershipUser, MemberBasic>()
@@ -143,7 +145,8 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(x => x.Updater, expression => expression.Ignore())
.ForMember(dto => dto.Trashed, expression => expression.Ignore())
.ForMember(x => x.Alias, expression => expression.Ignore())
.ForMember(x => x.ContentTypeAlias, expression => expression.Ignore());
.ForMember(x => x.ContentTypeAlias, expression => expression.Ignore())
.ForMember(member => member.HasPublishedVersion, expression => expression.Ignore());
//FROM IMember TO ContentItemDto<IMember>
config.CreateMap<IMember, ContentItemDto<IMember>>()
@@ -154,6 +157,7 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(x => x.Updater, expression => expression.Ignore())
.ForMember(x => x.Icon, expression => expression.Ignore())
.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>());
}