From bd1de4559db5c4d5e275cf9accb4ca1ea8e174a1 Mon Sep 17 00:00:00 2001 From: Per Ploug Date: Tue, 2 Jun 2015 11:57:43 +0200 Subject: [PATCH] Adjusting the content type display model --- .../Models/Mapping/ContentTypeModelMappingTests.cs | 6 +++--- .../Models/ContentEditing/ContentTypeDisplay.cs | 10 ++++++---- .../Models/Mapping/ContentTypeModelMapper.cs | 9 +-------- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs b/src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs index 977a7307d8..ba104df97d 100644 --- a/src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs +++ b/src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs @@ -96,7 +96,7 @@ namespace Umbraco.Tests.Models.Mapping Assert.AreEqual(display.ParentId, result.ParentId); Assert.AreEqual(display.Path, result.Path); Assert.AreEqual(display.Thumbnail, result.Thumbnail); - Assert.AreEqual(display.EnableListView, result.IsContainer); + Assert.AreEqual(display.IsContainer, result.IsContainer); //TODO: Now we need to assert all of the more complicated parts Assert.AreEqual(1, result.PropertyGroups.Count); @@ -138,7 +138,7 @@ namespace Umbraco.Tests.Models.Mapping Assert.AreEqual(contentType.ParentId, result.ParentId); Assert.AreEqual(contentType.Path, result.Path); Assert.AreEqual(contentType.Thumbnail, result.Thumbnail); - Assert.AreEqual(contentType.IsContainer, result.EnableListView); + Assert.AreEqual(contentType.IsContainer, result.IsContainer); Assert.AreEqual(contentType.DefaultTemplate.Alias, result.DefaultTemplate.Alias); @@ -164,7 +164,7 @@ namespace Umbraco.Tests.Models.Mapping Path = "-1,1234", ParentId = -1, Thumbnail = "tree-thumb", - EnableListView = true, + IsContainer = true, Groups = new List() { new PropertyTypeGroupDisplay diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentTypeDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/ContentTypeDisplay.cs index 0702893ff5..853e10d94f 100644 --- a/src/Umbraco.Web/Models/ContentEditing/ContentTypeDisplay.cs +++ b/src/Umbraco.Web/Models/ContentEditing/ContentTypeDisplay.cs @@ -33,13 +33,15 @@ namespace Umbraco.Web.Models.ContentEditing [DataMember(Name = "allowedContentTypes")] public IEnumerable AllowedContentTypes { get; set; } + //List view - [DataMember(Name = "enableListView")] - public bool EnableListView { get; set; } + [DataMember(Name = "isContainer")] + public bool IsContainer { get; set; } //we might not need this... - [DataMember(Name = "allowedAtRoot")] - public bool AllowedAtRoot { get; set; } + [DataMember(Name = "allowAsRoot")] + public bool AllowAsRoot { get; set; } + //Compositions [DataMember(Name = "compositeContentTypes")] diff --git a/src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs index ff0db8b46a..5b6432dc4b 100644 --- a/src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs +++ b/src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs @@ -46,7 +46,7 @@ namespace Umbraco.Web.Models.Mapping .ForMember(dto => dto.CreateDate, expression => expression.Ignore()) .ForMember(dto => dto.UpdateDate, expression => expression.Ignore()) .ForMember(dto => dto.SortOrder, expression => expression.Ignore()) - .ForMember(dto => dto.IsContainer, expression => expression.MapFrom(display => display.EnableListView)) + //ignore, we'll do this in after map .ForMember(dto => dto.PropertyGroups, expression => expression.Ignore()) .AfterMap((source, dest) => @@ -73,8 +73,6 @@ namespace Umbraco.Web.Models.Mapping if(add_ct != null) dest.AddContentType(add_ct); } - - }); config.CreateMap().ConvertUsing(x => x.Alias); @@ -94,15 +92,10 @@ namespace Umbraco.Web.Models.Mapping dto => dto.CompositeContentTypes, expression => expression.MapFrom(dto => dto.ContentTypeComposition)) - .ForMember( - display => display.EnableListView, - expression => expression.MapFrom(type => type.IsContainer)) - .ForMember( dto => dto.Groups, expression => expression.ResolveUsing(new PropertyTypeGroupResolver(applicationContext, _propertyEditorResolver))); - config.CreateMap() .ForMember(dest => dest.Id, expression => expression.Condition(source => source.Id > 0))