From 106a06be2ac29c55c7dbe72ca8a85058c7ca94bf Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 31 May 2017 13:09:26 +0200 Subject: [PATCH] Gets templates working --- src/Umbraco.Core/Persistence/Factories/UmbracoEntityFactory.cs | 2 +- src/Umbraco.Web/Models/ContentEditing/SearchResultItem.cs | 3 ++- src/Umbraco.Web/Models/Mapping/EntityModelMapper.cs | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Core/Persistence/Factories/UmbracoEntityFactory.cs b/src/Umbraco.Core/Persistence/Factories/UmbracoEntityFactory.cs index ded7c60676..86594836db 100644 --- a/src/Umbraco.Core/Persistence/Factories/UmbracoEntityFactory.cs +++ b/src/Umbraco.Core/Persistence/Factories/UmbracoEntityFactory.cs @@ -36,7 +36,7 @@ namespace Umbraco.Core.Persistence.Factories entity.DisableChangeTracking(); entity.CreateDate = d.createDate; - entity.CreatorId = d.nodeUser; + entity.CreatorId = d.nodeUser == null ? 0 : d.nodeUser; entity.Id = d.id; entity.Key = d.uniqueID; entity.Level = d.level; diff --git a/src/Umbraco.Web/Models/ContentEditing/SearchResultItem.cs b/src/Umbraco.Web/Models/ContentEditing/SearchResultItem.cs index 9bd9328853..ccbc281706 100644 --- a/src/Umbraco.Web/Models/ContentEditing/SearchResultItem.cs +++ b/src/Umbraco.Web/Models/ContentEditing/SearchResultItem.cs @@ -16,6 +16,7 @@ namespace Umbraco.Web.Models.ContentEditing ///// A caption for the search result ///// //[DataMember(Name = "caption")] - //public string Caption { get; set; } + //public string Caption { get; set; } + } } \ No newline at end of file diff --git a/src/Umbraco.Web/Models/Mapping/EntityModelMapper.cs b/src/Umbraco.Web/Models/Mapping/EntityModelMapper.cs index 126e7d13a2..5090769178 100644 --- a/src/Umbraco.Web/Models/Mapping/EntityModelMapper.cs +++ b/src/Umbraco.Web/Models/Mapping/EntityModelMapper.cs @@ -94,6 +94,8 @@ namespace Umbraco.Web.Models.Mapping basic.Icon = "icon-item-arrangement"; else if (entity.NodeObjectTypeId == Constants.ObjectTypes.MediaTypeGuid) basic.Icon = "icon-thumbnails"; + else if (entity.NodeObjectTypeId == Constants.ObjectTypes.TemplateTypeGuid) + basic.Icon = "icon-newspaper-alt"; } });