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

Import Document Type: use ContentTypeService to search for allowed child nodes if they are not part of the imported type(s)

Browse Source
This commit is contained in:
ChristophNZ
2018-02-22 15:53:11 +10:00
parent accf8ba5f2
commit 0d05d0bf34
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Umbraco.Core/Services/PackagingService.cs
View File

@@ -842,10 +842,19 @@ namespace Umbraco.Core.Services
}
else
{
_logger.Warn<PackagingService>(
string.Format(
"Packager: Error handling DocumentType structure. DocumentType with alias '{0}' could not be found and was not added to the structure for '{1}'.",
alias, contentType.Alias));
// DocumentType was not in imported or dependant types, try to get from ContentTypeService
var allowedChild = _contentTypeService.GetContentType(alias);
if (allowedChild == null)
{
_logger.Warn<PackagingService>(
string.Format(
"Packager: Error handling DocumentType structure. DocumentType with alias '{0}' could not be found and was not added to the structure for '{1}'.",
alias, contentType.Alias));
}
if (allowedChildren.Any(x => x.Id.IsValueCreated && x.Id.Value == allowedChild.Id)) continue;
allowedChildren.Add(new ContentTypeSort(new Lazy<int>(() => allowedChild.Id), sortOrder, allowedChild.Alias));
sortOrder++;
}
}