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 (builds)

Browse Source
This commit is contained in:
Stephan
2016-11-03 10:31:44 +01:00
parent d44ee715a9 1aade7c27c
commit b26b415096
412 changed files with 12532 additions and 5381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,6 +69,9 @@ namespace Umbraco.Web.Models.Mapping
expression => expression.MapFrom(content => GetPublishedDate(_contentService, content)))
.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 =>
@@ -76,6 +79,7 @@ namespace Umbraco.Web.Models.Mapping
? new[] {"Cannot generate urls without a current Umbraco Context"}
: content.GetContentUrls(UmbracoContext.Current)))
.ForMember(display => display.Properties, expression => expression.Ignore())
.ForMember(display => display.AllowPreview, expression => expression.Ignore())
.ForMember(display => display.TreeNodeUrl, expression => expression.Ignore())
.ForMember(display => display.Notifications, expression => expression.Ignore())
.ForMember(display => display.Errors, expression => expression.Ignore())
@@ -100,6 +104,9 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(
dto => dto.Trashed,
expression => expression.MapFrom(content => content.Trashed))
.ForMember(
dto => dto.HasPublishedVersion,
expression => expression.MapFrom(content => content.HasPublishedVersion))
.ForMember(
dto => dto.ContentTypeAlias,
expression => expression.MapFrom(content => content.ContentType.Alias))
@@ -110,6 +117,9 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(
dto => dto.Owner,
expression => expression.ResolveUsing(new OwnerResolver<IContent>(_userService)))
.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());