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

Merge remote-tracking branch 'origin/temp8' into temp8-packages-ui

Browse Source 
# Conflicts:
#	src/Umbraco.Core/Services/Implement/PackagingService.cs
This commit is contained in:
Shannon
2019-01-16 02:00:44 +11:00
parent b7c15dc393 561ce94398
commit b34582b35c
52 changed files with 193 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
View File

@@ -439,7 +439,8 @@ namespace Umbraco.Core.Services.Implement
new XElement("Thumbnail", contentType.Thumbnail),
new XElement("Description", contentType.Description),
new XElement("AllowAtRoot", contentType.AllowedAsRoot.ToString()),
new XElement("IsListView", contentType.IsContainer.ToString()));
new XElement("IsListView", contentType.IsContainer.ToString()),
new XElement("IsElement", contentType.IsElement.ToString()));
var masterContentType = contentType.ContentTypeComposition.FirstOrDefault(x => x.Id == contentType.ParentId);
if(masterContentType != null)