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

Merge pull request #2859 from sbwalker/dev

Browse Source 
make page path and moduile title lookups case insensitive
This commit is contained in:
Shaun Walker 2023-06-01 14:41:32 -04:00 committed by GitHub
commit 8f147e7de2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -319,14 +319,14 @@ namespace Oqtane.Repository
{ {
pages = _pageRepository.GetPages(site.SiteId).ToList(); 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) 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.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; page.Name = (page.Name.Contains("/")) ? page.Name.Substring(page.Name.LastIndexOf("/") + 1) : page.Name;
int? parentid = null; int? parentid = null;
if (!string.IsNullOrEmpty(pageTemplate.Parent)) if (!string.IsNullOrEmpty(pageTemplate.Parent))
@ -392,7 +392,7 @@ namespace Oqtane.Repository
var moduleDefinition = moduleDefinitions.Where(item => item.ModuleDefinitionName == pageTemplateModule.ModuleDefinitionName).FirstOrDefault(); var moduleDefinition = moduleDefinitions.Where(item => item.ModuleDefinitionName == pageTemplateModule.ModuleDefinitionName).FirstOrDefault();
if (moduleDefinition != null) 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) if (pageModule == null)
{ {
pageModule = new PageModule(); pageModule = new PageModule();