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

Adjusting the content type display model

Browse Source
This commit is contained in:
Per Ploug
2015-06-02 11:57:43 +02:00
parent bb5a89956c
commit bd1de4559d
3 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs
View File

@@ -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<PropertyTypeGroupDisplay>()
{
new PropertyTypeGroupDisplay

10
src/Umbraco.Web/Models/ContentEditing/ContentTypeDisplay.cs
View File

@@ -33,13 +33,15 @@ namespace Umbraco.Web.Models.ContentEditing
[DataMember(Name = "allowedContentTypes")]
public IEnumerable<EntityBasic> 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")]

9
src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs
View File

@@ -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<IContentTypeComposition, string>().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<PropertyTypeGroupDisplay, PropertyGroup>()
.ForMember(dest => dest.Id, expression => expression.Condition(source => source.Id > 0))