kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix page template logic on install

Browse Source
This commit is contained in:
sbwalker 2023-06-10 09:17:52 -04:00
parent 2299375aaa
commit d52809c914
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Client/Installer/Installer.razor
View File

@ -13,7 +13,7 @@
<div class="row"> <div class="row">
<div class="mx-auto text-center"> <div class="mx-auto text-center">
<img src="oqtane-black.png" /> <img src="oqtane-black.png" />
<div style="font-weight: bold">@SharedLocalizer["Version"] @Constants.Version</div> <div style="font-weight: bold">@SharedLocalizer["Version"] @Constants.Version @SharedLocalizer["For"] .NET 7</div>
</div> </div>
</div> </div>
<hr class="app-rule" /> <hr class="app-rule" />

3
Oqtane.Client/Resources/Installer/Installer.resx
View File

@ -180,4 +180,7 @@
<data name="EnterConnectionString" xml:space="preserve"> <data name="EnterConnectionString" xml:space="preserve">
<value>Enter Connection String</value> <value>Enter Connection String</value>
</data> </data>
<data name="For" xml:space="preserve">
<value>for</value>
</data>
</root> </root>

16
Oqtane.Server/Repository/SiteRepository.cs
View File

@ -328,25 +328,29 @@ namespace Oqtane.Repository
} }
pageTemplate.Path = (parent != null) ? parent.Path + "/" + pageTemplate.Name : pageTemplate.Name; 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()); var page = pages.FirstOrDefault(item => item.Path.ToLower() == pageTemplate.Path.ToLower());
if (page == null) if (page == null)
{ {
page = new Page(); page = new Page();
page.SiteId = site.SiteId; 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 (string.IsNullOrEmpty(pageTemplate.Parent))
{ {
if (pageTemplate.Path.Contains("/")) 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; page.ParentId = (parent != null) ? parent.PageId : null;
if (string.IsNullOrEmpty(pageTemplate.Name)) page.Path = page.Path.ToLower();
{
page.Name = (pageTemplate.Path.Contains("/")) ? pageTemplate.Path.Substring(pageTemplate.Name.LastIndexOf("/") + 1) : pageTemplate.Path;
}
page.Title = pageTemplate.Title; page.Title = pageTemplate.Title;
page.Order = pageTemplate.Order; page.Order = pageTemplate.Order;
page.Url = pageTemplate.Url; page.Url = pageTemplate.Url;