From d52809c91458fe6c0e3db415736be1bc419828fa Mon Sep 17 00:00:00 2001
From: sbwalker <shaun.walker@siliqon.com>
Date: Sat, 10 Jun 2023 09:17:52 -0400
Subject: [PATCH] fix page template logic on install

---
 Oqtane.Client/Installer/Installer.razor          |  2 +-
 Oqtane.Client/Resources/Installer/Installer.resx |  3 +++
 Oqtane.Server/Repository/SiteRepository.cs       | 16 ++++++++++------
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Oqtane.Client/Installer/Installer.razor b/Oqtane.Client/Installer/Installer.razor
index eac10c3f..5283291a 100644
--- a/Oqtane.Client/Installer/Installer.razor
+++ b/Oqtane.Client/Installer/Installer.razor
@@ -13,7 +13,7 @@
     <div class="row">
         <div class="mx-auto text-center">
             <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>
     <hr class="app-rule" />
diff --git a/Oqtane.Client/Resources/Installer/Installer.resx b/Oqtane.Client/Resources/Installer/Installer.resx
index ec83b9bb..cc67d0a7 100644
--- a/Oqtane.Client/Resources/Installer/Installer.resx
+++ b/Oqtane.Client/Resources/Installer/Installer.resx
@@ -180,4 +180,7 @@
   <data name="EnterConnectionString" xml:space="preserve">
     <value>Enter Connection String</value>
   </data>
+  <data name="For" xml:space="preserve">
+    <value>for</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Server/Repository/SiteRepository.cs b/Oqtane.Server/Repository/SiteRepository.cs
index 3fa2dc03..596d13f7 100644
--- a/Oqtane.Server/Repository/SiteRepository.cs
+++ b/Oqtane.Server/Repository/SiteRepository.cs
@@ -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;