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

Merge remote-tracking branch 'origin/temp8' into feature/IContentType-removale-from-IContent

Browse Source 
# Conflicts:
#	src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs
This commit is contained in:
Bjarke Berg
2019-01-16 12:53:58 +01:00
parent 1f87ce02a1 d0016d6a7e
commit 4ccc468cb6
57 changed files with 210 additions and 2293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,6 +48,7 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(dest => dest.ContentTypeAlias, opt => opt.MapFrom(src => src.ContentType.Alias))
.ForMember(dest => dest.ContentTypeName, opt => opt.MapFrom(src => src.ContentType.Name))
.ForMember(dest => dest.IsContainer, opt => opt.MapFrom(src => src.ContentType.IsContainer))
.ForMember(dest => dest.IsElement, opt => opt.MapFrom(src => src.ContentType.IsElement))
.ForMember(dest => dest.IsBlueprint, opt => opt.MapFrom(src => src.Blueprint))
.ForMember(dest => dest.IsChildOfListView, opt => opt.ResolveUsing(childOfListViewResolver))
.ForMember(dest => dest.Trashed, opt => opt.MapFrom(src => src.Trashed))
@@ -161,5 +162,4 @@ namespace Umbraco.Web.Models.Mapping
}
}
}