Diplomarbeit-Absolventenverein/oqtane.framework-not-mirrored
Archived
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3204 from sbwalker/dev

Browse Source 
fix page template update logic
This commit is contained in:
Shaun Walker 2023-08-28 16:12:47 -04:00 committed by GitHub
commit b713cf86c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -372,7 +372,9 @@ namespace Oqtane.Repository
page.PermissionList = pageTemplate.PermissionList;
try
{
if (page.PageId != 0 && pageTemplate.Update)
if (page.PageId != 0)
{
if (pageTemplate.Update)
{
page = _pageRepository.UpdatePage(page);
if (alias != null)
@ -380,6 +382,7 @@ namespace Oqtane.Repository
_logger.Log(LogLevel.Information, "Site Template", LogFunction.Update, "Page Updated {Page}", page);
}
}
}
else
{
page = _pageRepository.AddPage(page);
@ -430,7 +433,9 @@ namespace Oqtane.Repository
pageModule.Module.IsDeleted = false;
try
{
if (pageModule.ModuleId != 0 && pageTemplate.Update)
if (pageModule.ModuleId != 0)
{
if (pageTemplate.Update)
{
_moduleRepository.UpdateModule(pageModule.Module);
_pageModuleRepository.UpdatePageModule(pageModule);
@ -440,6 +445,11 @@ namespace Oqtane.Repository
}
}
else
{
pageTemplateModule.Content = ""; // do not update content
}
}
else
{
var module = _moduleRepository.AddModule(pageModule.Module);
pageModule.ModuleId = module.ModuleId;