diff --git a/src/Umbraco.Core/Models/Template.cs b/src/Umbraco.Core/Models/Template.cs index 1941e19d40..c032e290b1 100644 --- a/src/Umbraco.Core/Models/Template.cs +++ b/src/Umbraco.Core/Models/Template.cs @@ -20,7 +20,6 @@ namespace Umbraco.Core.Models private int _level; private int _sortOrder; private int _parentId; - private string _nodePath; private int _masterTemplateId; private string _masterTemplateAlias; @@ -28,7 +27,6 @@ namespace Umbraco.Core.Models private static readonly PropertyInfo LevelSelector = ExpressionHelper.GetPropertyInfo(x => x.Level); private static readonly PropertyInfo SortOrderSelector = ExpressionHelper.GetPropertyInfo(x => x.SortOrder); private static readonly PropertyInfo ParentIdSelector = ExpressionHelper.GetPropertyInfo(x => x.ParentId); - private static readonly PropertyInfo NodePathSelector = ExpressionHelper.GetPropertyInfo(x => x.NodePath); //private static readonly PropertyInfo MasterTemplateIdSelector = ExpressionHelper.GetPropertyInfo(x => x.MasterTemplateId); private static readonly PropertyInfo MasterTemplateAliasSelector = ExpressionHelper.GetPropertyInfo(x => x.MasterTemplateAlias); @@ -104,21 +102,7 @@ namespace Umbraco.Core.Models }, _parentId, ParentIdSelector); } } - - [DataMember] - internal string NodePath - { - get { return _nodePath; } - set - { - SetPropertyValueAndDetectChanges(o => - { - _nodePath = value; - return _nodePath; - }, _nodePath, NodePathSelector); - } - } - + [DataMember] internal Lazy MasterTemplateId { get; set; } diff --git a/src/Umbraco.Core/Persistence/Factories/TemplateFactory.cs b/src/Umbraco.Core/Persistence/Factories/TemplateFactory.cs index ae2c2831f8..a62e9d3c00 100644 --- a/src/Umbraco.Core/Persistence/Factories/TemplateFactory.cs +++ b/src/Umbraco.Core/Persistence/Factories/TemplateFactory.cs @@ -37,7 +37,7 @@ namespace Umbraco.Core.Persistence.Factories Level = dto.NodeDto.Level, ParentId = dto.NodeDto.ParentId, SortOrder = dto.NodeDto.SortOrder, - NodePath = dto.NodeDto.Path + Path = dto.NodeDto.Path }; if(dto.Master.HasValue) @@ -83,7 +83,7 @@ namespace Umbraco.Core.Persistence.Factories Level = short.Parse(entity.Level.ToString(CultureInfo.InvariantCulture)), NodeObjectType = _nodeObjectTypeId, ParentId = entity.ParentId, - Path = entity.NodePath, + Path = entity.Path, SortOrder = entity.SortOrder, Text = entity.Name, Trashed = false,