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

Removed adding compositions from parents as this breaks core functionality.

Browse Source 
Ignoring property in mappings where it isnt needed.
Updating the LockedCompositionsResolver to get parent and use path instead of trying to use path which can be null on GetEmpty.
This commit is contained in:
Claus
2016-01-08 13:59:39 +01:00
parent 3676de0fe8
commit f62920dc47
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Core/Models/ContentTypeCompositionBase.cs
View File

@@ -102,11 +102,6 @@ namespace Umbraco.Core.Models
throw new InvalidCompositionException(Alias, contentType.Alias, conflictingPropertyTypeAliases.ToArray());
_contentTypeComposition.Add(contentType);
//Make sure to include the composition's compositions since this is possible with inheritance
foreach (var contentTypeComposition in contentType.ContentTypeComposition)
{
_contentTypeComposition.Add(contentTypeComposition);
}
OnPropertyChanged(ContentTypeCompositionSelector);
return true;
}

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

@@ -54,10 +54,11 @@ namespace Umbraco.Web.Models.Mapping
{
return mapping
.ForMember(dto => dto.CreateDate, expression => expression.Ignore())
.ForMember(dto => dto.UpdateDate, expression => expression.Ignore())
.ForMember(dto => dto.UpdateDate, expression => expression.Ignore())
.ForMember(dto => dto.ListViewEditorName, expression => expression.Ignore())
.ForMember(dto => dto.Notifications, expression => expression.Ignore())
.ForMember(dto => dto.Errors, expression => expression.Ignore());
.ForMember(dto => dto.Errors, expression => expression.Ignore())
.ForMember(dto => dto.LockedCompositeContentTypes, exp => exp.Ignore());
}
public static IMappingExpression<TSource, TDestination> MapBaseContentTypeEntityToDisplay<TSource, TDestination>(

23
src/Umbraco.Web/Models/Mapping/LockedCompositionsResolver.cs
View File

@@ -17,17 +17,24 @@ namespace Umbraco.Web.Models.Mapping
protected override IEnumerable<string> ResolveCore(IContentTypeComposition source)
{
// get ancestor ids from path (exclude current node id)
var ancestorIds = source.Path.Substring(0, source.Path.LastIndexOf(',')).Split(',').Select(int.Parse);
var aliases = new List<string>();
// loop through all content types and return ordered aliases of ancestors
var allContentTypes = _applicationContext.Services.ContentTypeService.GetAllContentTypes().ToArray();
foreach (var ancestorId in ancestorIds)
// get ancestor ids from path of parent if not root
if (source.ParentId != Constants.System.Root)
{
var ancestor = allContentTypes.FirstOrDefault(x => x.Id == ancestorId);
if (ancestor != null)
var parent = _applicationContext.Services.ContentTypeService.GetContentType(source.ParentId);
if (parent != null)
{
aliases.Add(ancestor.Alias);
var ancestorIds = parent.Path.Split(',').Select(int.Parse);
// loop through all content types and return ordered aliases of ancestors
var allContentTypes = _applicationContext.Services.ContentTypeService.GetAllContentTypes().ToArray();
foreach (var ancestorId in ancestorIds)
{
var ancestor = allContentTypes.FirstOrDefault(x => x.Id == ancestorId);
if (ancestor != null)
{
aliases.Add(ancestor.Alias);
}
}
}
}
return aliases.OrderBy(x => x);