From 85358c7dd4d2537e702d41f4526e6d0bb8f86161 Mon Sep 17 00:00:00 2001 From: sbwalker Date: Thu, 1 Jun 2023 14:40:59 -0400 Subject: [PATCH] make page path and moduile title lookups case insensitive --- Oqtane.Server/Repository/SiteRepository.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Oqtane.Server/Repository/SiteRepository.cs b/Oqtane.Server/Repository/SiteRepository.cs index 798f92e6..92916fe9 100644 --- a/Oqtane.Server/Repository/SiteRepository.cs +++ b/Oqtane.Server/Repository/SiteRepository.cs @@ -319,14 +319,14 @@ namespace Oqtane.Repository { pages = _pageRepository.GetPages(site.SiteId).ToList(); } - var page = pages.FirstOrDefault(item => item.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.Name = (string.IsNullOrEmpty(pageTemplate.Name)) ? page.Path : pageTemplate.Name; + page.Name = (!string.IsNullOrEmpty(pageTemplate.Name)) ? pageTemplate.Name : page.Path; page.Name = (page.Name.Contains("/")) ? page.Name.Substring(page.Name.LastIndexOf("/") + 1) : page.Name; int? parentid = null; if (!string.IsNullOrEmpty(pageTemplate.Parent)) @@ -392,7 +392,7 @@ namespace Oqtane.Repository var moduleDefinition = moduleDefinitions.Where(item => item.ModuleDefinitionName == pageTemplateModule.ModuleDefinitionName).FirstOrDefault(); if (moduleDefinition != null) { - var pageModule = pageModules.FirstOrDefault(item => item.PageId == page.PageId && item.Module.ModuleDefinitionName == pageTemplateModule.ModuleDefinitionName && item.Title == pageTemplateModule.Title); + var pageModule = pageModules.FirstOrDefault(item => item.PageId == page.PageId && item.Module.ModuleDefinitionName == pageTemplateModule.ModuleDefinitionName && item.Title.ToLower() == pageTemplateModule.Title.ToLower()); if (pageModule == null) { pageModule = new PageModule();