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

Ensures virtual path is set on the template, updates the tree controller to render the correct editor if it's webforms, updates the rest service to return the updated contents if the server changes it and updates the UI

Browse Source
This commit is contained in:
Shannon
2015-01-09 17:01:38 +11:00
parent 5bef3593dd
commit caf972cd0f
7 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
View File

@@ -172,8 +172,6 @@ namespace Umbraco.Core.Persistence.Repositories
var o = Database.IsNew(nodeDto) ? Convert.ToInt32(Database.Insert(nodeDto)) : Database.Update(nodeDto);
//Update with new correct path
//TODO: need to fix:
// http://issues.umbraco.org/issue/U4-5846
var parent = Get(template.MasterTemplateId.Value);
if (parent != null)
{
@@ -236,9 +234,6 @@ namespace Umbraco.Core.Persistence.Repositories
var template = (Template)entity;
//TODO: need to fix:
// http://issues.umbraco.org/issue/U4-5846
// And use the ParentId column instead of the extra template parent id column
if (entity.IsPropertyDirty("MasterTemplateId"))
{
var parent = Get(template.MasterTemplateId.Value);
@@ -417,6 +412,7 @@ namespace Umbraco.Core.Persistence.Repositories
}
template.UpdateDate = _viewsFileSystem.GetLastModified(fileName).UtcDateTime;
template.Content = content;
template.VirtualPath = _viewsFileSystem.GetUrl(fileName);
}
private void PopulateMasterpageTemplate(ITemplate template, string fileName)
@@ -431,6 +427,7 @@ namespace Umbraco.Core.Persistence.Repositories
template.UpdateDate = _masterpagesFileSystem.GetLastModified(fileName).UtcDateTime;
template.Content = content;
template.VirtualPath = _masterpagesFileSystem.GetUrl(fileName);
}
#region Implementation of ITemplateRepository