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

Merge pull request #1094 from umbraco/temp-U4-7691

Browse Source 
Fixes: U4-7691 7.4 beta - Document composition is not working with me…
This commit is contained in:
Shannon Deminick
2016-02-03 15:26:43 +01:00
parent 65c3f8c513 24d42e6bd1
commit 864ca4e40e
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,7 +69,12 @@ namespace Umbraco.Web.Models.Mapping
foreach (var a in add)
{
//TODO: Remove N+1 lookup
var addCt = applicationContext.Services.ContentTypeService.GetContentType(a);
//since we don't really know from the alias what type of content type this is,
//we look up by content type first and then by media type if not found.
//content type aliases are unique so this should be safe to do.
IContentTypeComposition addCt = applicationContext.Services.ContentTypeService.GetContentType(a);
if (addCt == null)
addCt = applicationContext.Services.ContentTypeService.GetMediaType(a);
if (addCt != null)
dest.AddContentType(addCt);
}