Merge pull request #2879 from sbwalker/dev
fix page template logic on install
This commit is contained in:
@ -328,25 +328,29 @@ namespace Oqtane.Repository
|
||||
}
|
||||
pageTemplate.Path = (parent != null) ? parent.Path + "/" + pageTemplate.Name : pageTemplate.Name;
|
||||
}
|
||||
pageTemplate.Path = (pageTemplate.Path.ToLower() == "home") ? "" : pageTemplate.Path;
|
||||
pageTemplate.Path = (pageTemplate.Path == "/") ? "" : pageTemplate.Path;
|
||||
var page = pages.FirstOrDefault(item => item.Path.ToLower() == pageTemplate.Path.ToLower());
|
||||
if (page == null)
|
||||
{
|
||||
page = new Page();
|
||||
page.SiteId = site.SiteId;
|
||||
page.Path = pageTemplate.Path.ToLower();
|
||||
page.Path = pageTemplate.Path;
|
||||
}
|
||||
page.Name = pageTemplate.Name;
|
||||
if (string.IsNullOrEmpty(page.Name))
|
||||
{
|
||||
page.Name = (pageTemplate.Path.Contains("/")) ? pageTemplate.Path.Substring(pageTemplate.Name.LastIndexOf("/") + 1) : pageTemplate.Path;
|
||||
}
|
||||
if (string.IsNullOrEmpty(pageTemplate.Parent))
|
||||
{
|
||||
if (pageTemplate.Path.Contains("/"))
|
||||
{
|
||||
parent = pages.FirstOrDefault(item => item.Path.ToLower() == pageTemplate.Path.Substring(0, pageTemplate.Path.LastIndexOf("/")));
|
||||
parent = pages.FirstOrDefault(item => item.Path.ToLower() == pageTemplate.Path.Substring(0, pageTemplate.Path.LastIndexOf("/")).ToLower());
|
||||
}
|
||||
}
|
||||
page.ParentId = (parent != null) ? parent.PageId : null;
|
||||
if (string.IsNullOrEmpty(pageTemplate.Name))
|
||||
{
|
||||
page.Name = (pageTemplate.Path.Contains("/")) ? pageTemplate.Path.Substring(pageTemplate.Name.LastIndexOf("/") + 1) : pageTemplate.Path;
|
||||
}
|
||||
page.Path = page.Path.ToLower();
|
||||
page.Title = pageTemplate.Title;
|
||||
page.Order = pageTemplate.Order;
|
||||
page.Url = pageTemplate.Url;
|
||||
|
Reference in New Issue
Block a user