Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion uSync.AutoTemplates/TemplateWatcher.cs
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ private void CheckFile(string filename)

if (template != null)
{
var currentMaster = string.IsNullOrWhiteSpace(template.MasterTemplateAlias) ? "null" : template.MasterTemplateAlias;
var currentMaster = string.IsNullOrWhiteSpace(template.LayoutTemplateAlias) ? "null" : template.LayoutTemplateAlias;
if (fileMasterAlias != currentMaster)
{
// template.SetMasterTemplate(GetMasterTemplate(fileMasterAlias));
Expand Down
2 changes: 1 addition & 1 deletion uSync.BackOffice/SyncHandlers/Handlers/TemplateHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ protected override async Task<IReadOnlyList<OrderedNodeInfo>> GetMergedItemsAsyn

// top level, lets check they aren't secretly lower down.
var templateContent = await GetTemplateContentAsync(item.Alias);
var masterAlias = _templateContentParserService.MasterTemplateAlias(templateContent);
var masterAlias = _templateContentParserService.LayoutTemplateAlias(templateContent);
if (string.IsNullOrWhiteSpace(masterAlias) || masterAlias == item.Alias || masterAlias.InvariantEquals("null"))
{
results.Add(item);
Expand Down
8 changes: 4 additions & 4 deletions uSync.Core/Serialization/Serializers/TemplateSerializer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ protected override async Task<SyncAttempt<XElement>> SerializeCoreAsync(ITemplat
var node = this.InitializeBaseNode(item, item.Alias, await this.CalculateLevelAsync(item));

node.Add(new XElement("Name", item.Name));
node.Add(new XElement("Parent", item.MasterTemplateAlias));
node.Add(new XElement("Parent", item.LayoutTemplateAlias));

if (options.GetSetting(uSyncConstants.Conventions.IncludeContent, false))
{
Expand All @@ -322,14 +322,14 @@ private static XElement SerializeContent(ITemplate item)

private async Task<int> CalculateLevelAsync(ITemplate item)
{
if (item.MasterTemplateAlias.IsNullOrWhiteSpace()) return 1;
if (item.LayoutTemplateAlias.IsNullOrWhiteSpace()) return 1;

int level = 1;
var current = item;
while (!string.IsNullOrWhiteSpace(current.MasterTemplateAlias) && level < 20)
while (!string.IsNullOrWhiteSpace(current.LayoutTemplateAlias) && level < 20)
{
level++;
var parent = await FindItemAsync(current.MasterTemplateAlias);
var parent = await FindItemAsync(current.LayoutTemplateAlias);
if (parent == null) return level;

current = parent;
Expand Down
Loading