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

Fixed Template model class to not have it's own NodePath property which was always null since it wasn't mapped (and there was no point in it).

Browse Source
This commit is contained in:
Shannon
2013-07-24 10:11:05 +10:00
parent 80394f08fb
commit 8b2d1b8eab
2 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Umbraco.Core/Models/Template.cs
View File

@@ -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<Template, int>(x => x.Level);
private static readonly PropertyInfo SortOrderSelector = ExpressionHelper.GetPropertyInfo<Template, int>(x => x.SortOrder);
private static readonly PropertyInfo ParentIdSelector = ExpressionHelper.GetPropertyInfo<Template, int>(x => x.ParentId);
private static readonly PropertyInfo NodePathSelector = ExpressionHelper.GetPropertyInfo<Template, string>(x => x.NodePath);
//private static readonly PropertyInfo MasterTemplateIdSelector = ExpressionHelper.GetPropertyInfo<Template, int>(x => x.MasterTemplateId);
private static readonly PropertyInfo MasterTemplateAliasSelector = ExpressionHelper.GetPropertyInfo<Template, string>(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<int> MasterTemplateId { get; set; }

4
src/Umbraco.Core/Persistence/Factories/TemplateFactory.cs
View File

@@ -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,