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

Fixed: New document types fails to save

Browse Source
This commit is contained in:
Per Ploug
2015-09-23 20:40:03 +02:00
parent 3b21936898
commit 1d23d2b7c6
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web/Editors/ContentTypeController.cs
View File

@@ -129,6 +129,8 @@ namespace Umbraco.Web.Editors
//set id to null to ensure its handled as a new type
contentType.Id = null;
contentType.CreateDate = DateTime.Now;
contentType.UpdateDate = DateTime.Now;
//create a default template if it doesnt exist -but only if default template is == to the content type

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

@@ -43,6 +43,7 @@ namespace Umbraco.Web.Models.Mapping
//only map id if set to something higher then zero
.ForMember(dto => dto.Id, expression => expression.Condition(display => (Convert.ToInt32(display.Id) > 0)))
.ForMember(dto => dto.Id, expression => expression.MapFrom(display => Convert.ToInt32(display.Id)))
.ForMember(dto => dto.AllowedAsRoot, expression => expression.MapFrom(display => display.AllowAsRoot))
.ForMember(dto => dto.CreatorId, expression => expression.Ignore())
.ForMember(dto => dto.Level, expression => expression.Ignore())
@@ -118,14 +119,14 @@ namespace Umbraco.Web.Models.Mapping
config.CreateMap<ContentTypeDisplay, IContentType>()
.ConstructUsing((source) => new ContentType(source.ParentId))
.ForMember(dto => dto.Id, expression => expression.Ignore())
.ForMember(dto => dto.AllowedTemplates, expression => expression.Ignore())
.ForMember(dto => dto.DefaultTemplate, expression => expression.Ignore())
.AfterMap((source, dest) =>
{
//sync templates
dest.AllowedTemplates = source.AllowedTemplates.Select(x => Mapper.Map<ITemplate>(x));
dest.AllowedTemplates = source.AllowedTemplates.Where(x => x != null).Select(x => Mapper.Map<ITemplate>(x));
if (source.DefaultTemplate != null)
dest.SetDefaultTemplate(Mapper.Map<ITemplate>(source.DefaultTemplate));

2
src/Umbraco.Web/Models/Mapping/EntityModelMapper.cs
View File

@@ -58,7 +58,7 @@ namespace Umbraco.Web.Models.Mapping
Id = Convert.ToInt32(basic.Id),
Key = basic.Key
})
.ForMember(t => t.Path, expression => expression.MapFrom(template => template.Path))
.ForMember(t => t.Path, expression => expression.Ignore())
.ForMember(t => t.Id, expression => expression.MapFrom(template => Convert.ToInt32(template.Id)))
.ForMember(x => x.VirtualPath, expression => expression.Ignore())
.ForMember(x => x.CreateDate, expression => expression.Ignore())