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

Merge branch 'dev-v7-contenttypeeditor' of https://github.com/umbraco/Umbraco-CMS into dev-v7-contenttypeeditor

Browse Source
This commit is contained in:
Per Ploug
2015-06-06 08:40:11 +02:00
parent cf3dfe4992 61519f1762
commit 34060ceed6
15 changed files with 402 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Web/Models/ContentEditing/ContentTypeBasic.cs
View File

@@ -1,4 +1,5 @@
using System.ComponentModel.DataAnnotations;
using System;
using System.ComponentModel.DataAnnotations;
using System.Runtime.Serialization;
using Umbraco.Core;
using Umbraco.Core.IO;
@@ -14,6 +15,11 @@ namespace Umbraco.Web.Models.ContentEditing
[DataContract(Name = "contentType", Namespace = "")]
public class ContentTypeBasic : EntityBasic
{
[DataMember(Name = "updateDate")]
public DateTime UpdateDate { get; set; }
[DataMember(Name = "createDate")]
public DateTime CreateDate { get; set; }
[DataMember(Name = "description")]
public string Description { get; set; }

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

@@ -46,8 +46,6 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(dto => dto.AllowedAsRoot, expression => expression.MapFrom(display => display.AllowAsRoot))
.ForMember(dto => dto.CreatorId, expression => expression.Ignore())
.ForMember(dto => dto.Level, expression => expression.Ignore())
.ForMember(dto => dto.CreateDate, expression => expression.Ignore())
.ForMember(dto => dto.UpdateDate, expression => expression.Ignore())
.ForMember(dto => dto.SortOrder, expression => expression.Ignore())
//mapped in aftermap
.ForMember(dto => dto.AllowedContentTypes, expression => expression.Ignore())
@@ -65,7 +63,7 @@ namespace Umbraco.Web.Models.Mapping
//Sync allowed child types
var allowedTypes = source.AllowedContentTypes.Select((t, i) => new ContentTypeSort(t, i));
dest.AllowedContentTypes = allowedTypes;
dest.AllowedContentTypes = allowedTypes.ToArray();
//sync compositions
var current = dest.CompositionAliases().ToArray();
@@ -108,22 +106,17 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(
dto => dto.CompositeContentTypes,
expression => expression.MapFrom(dto => dto.ContentTypeComposition))
.ForMember(
dto => dto.CompositeContentTypes,
expression => expression.MapFrom(dto => dto.ContentTypeComposition))
.ForMember(
dto => dto.Groups,
expression => expression.ResolveUsing(new PropertyTypeGroupResolver(applicationContext, _propertyEditorResolver)));
config.CreateMap<PropertyGroupDisplay, PropertyGroup>()
.ForMember(dest => dest.Id, expression => expression.Condition(source => source.Id > 0))
.ForMember(g => g.CreateDate, expression => expression.Ignore())
.ForMember(g => g.Key, expression => expression.Ignore())
.ForMember(g => g.CreateDate, expression => expression.Ignore())
.ForMember(g => g.HasIdentity, expression => expression.Ignore())
.ForMember(g => g.UpdateDate, expression => expression.Ignore())
.ForMember(g => g.HasIdentity, expression => expression.Ignore())
.ForMember(dto => dto.CreateDate, expression => expression.Ignore())
.ForMember(dto => dto.UpdateDate, expression => expression.Ignore())
//only map if a parent is actually set
.ForMember(g => g.ParentId, expression => expression.Condition(display => display.ParentGroupId > 0))
@@ -150,6 +143,9 @@ namespace Umbraco.Web.Models.Mapping
if (dataType == null) throw new NullReferenceException("No data type found with id " + propertyTypeDisplay.DataTypeId);
return new PropertyType(dataType, propertyTypeDisplay.Alias);
})
.ForMember(dest => dest.Id, expression => expression.Condition(source => source.Id > 0))
.ForMember(dto => dto.CreateDate, expression => expression.Ignore())
.ForMember(dto => dto.UpdateDate, expression => expression.Ignore())
.ForMember(type => type.PropertyGroupId, expression => expression.MapFrom(display => new Lazy<int>(() => display.GroupId, LazyThreadSafetyMode.None)))
.ForMember(type => type.Key, expression => expression.Ignore())
.ForMember(type => type.HelpText, expression => expression.Ignore())
@@ -158,9 +154,6 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(type => type.Alias, expression => expression.Ignore())
//ignore because this is obsolete and shouldn't be used
.ForMember(type => type.DataTypeId, expression => expression.Ignore())
//ignore because these are 'readonly'
.ForMember(type => type.CreateDate, expression => expression.Ignore())
.ForMember(type => type.UpdateDate, expression => expression.Ignore())
.ForMember(type => type.Mandatory, expression => expression.MapFrom(display => display.Validation.Mandatory))
.ForMember(type => type.ValidationRegExp, expression => expression.MapFrom(display => display.Validation.Pattern))
.ForMember(type => type.PropertyEditorAlias, expression => expression.MapFrom(display => display.Editor))

4
src/Umbraco.Web/Models/Mapping/PropertyTypeGroupResolver.cs
View File

@@ -165,7 +165,9 @@ namespace Umbraco.Web.Models.Mapping
ContentTypeId = contentType.Id,
ContentTypeName = contentType.Name,
GroupId = groupId,
Inherited = inherited
Inherited = inherited,
DataTypeId = p.DataTypeDefinitionId,
SortOrder = p.SortOrder
});
}