Diplomarbeit-Absolventenverein/oqtane.framework
6
0
Fork 0
Code Issues 1 Pull Requests 1 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
parent 54f3c8beac 11d02ccf44
commit b713cf86c7
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -372,12 +372,15 @@ namespace Oqtane.Repository
page.PermissionList = pageTemplate.PermissionList;
try
{
if (page.PageId != 0 && pageTemplate.Update)
if (page.PageId != 0)
{
page = _pageRepository.UpdatePage(page);
if (alias != null)
if (pageTemplate.Update)
{
_logger.Log(LogLevel.Information, "Site Template", LogFunction.Update, "Page Updated {Page}", page);
page = _pageRepository.UpdatePage(page);
if (alias != null)
{
_logger.Log(LogLevel.Information, "Site Template", LogFunction.Update, "Page Updated {Page}", page);
}
}
}
else
@ -430,13 +433,20 @@ namespace Oqtane.Repository
pageModule.Module.IsDeleted = false;
try
{
if (pageModule.ModuleId != 0 && pageTemplate.Update)
if (pageModule.ModuleId != 0)
{
_moduleRepository.UpdateModule(pageModule.Module);
_pageModuleRepository.UpdatePageModule(pageModule);
if (alias != null)
if (pageTemplate.Update)
{
_logger.Log(LogLevel.Information, "Site Template", LogFunction.Update, "Page Module Updated {PageModule}", pageModule);
_moduleRepository.UpdateModule(pageModule.Module);
_pageModuleRepository.UpdatePageModule(pageModule);
if (alias != null)
{
_logger.Log(LogLevel.Information, "Site Template", LogFunction.Update, "Page Module Updated {PageModule}", pageModule);
}
}
else
{
pageTemplateModule.Content = ""; // do not update content
}
}
else