Diplomarbeit-Absolventenverein/oqtane.framework
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix #6111 - regression issue caused by #6106

Browse Source 
Related Work Items: #6
This commit is contained in:
sbwalker
2026-03-06 11:18:50 -05:00
parent d2e5ab61da
commit f09b21295a
3 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Oqtane.Server/Repository/ModuleRepository.cs
View File

@@ -132,7 +132,6 @@ namespace Oqtane.Repository
{
try
{
module.IPortableContext = "Export Module";
module.Settings = settings.ToDictionary(x => x.SettingName, x => x.SettingValue);
var moduleobject = ActivatorUtilities.CreateInstance(_serviceProvider, moduletype);
modulecontent.Content = ((IPortable)moduleobject).ExportModule(module);
@@ -173,13 +172,24 @@ namespace Oqtane.Repository
ModuleDefinition moduledefinition = moduledefinitions.Where(item => item.ModuleDefinitionName == module.ModuleDefinitionName).FirstOrDefault();
if (moduledefinition != null)
{
ModuleContent modulecontent = JsonSerializer.Deserialize<ModuleContent>(content.Replace("\n", ""));
var modulecontent = new ModuleContent();
if (content.StartsWith("{") && content.EndsWith("}"))
{
// content was exported as a serialized ModuleContent object
modulecontent = JsonSerializer.Deserialize<ModuleContent>(content.Replace("\n", ""));
}
else
{
// raw content
modulecontent.ModuleDefinitionName = moduledefinition.ModuleDefinitionName;
modulecontent.Version = moduledefinition.Version;
modulecontent.Content = content;
}
if (modulecontent.ModuleDefinitionName == moduledefinition.ModuleDefinitionName)
{
var settings = _settings.GetSettings(EntityNames.Module, module.ModuleId);
if (modulecontent.Settings != null)
{
var settings = _settings.GetSettings(EntityNames.Module, module.ModuleId);
foreach (var kvp in modulecontent.Settings)
{
var setting = settings.FirstOrDefault(item => item.SettingName == kvp.Key);
@@ -206,7 +216,6 @@ namespace Oqtane.Repository
{
try
{
module.IPortableContext = "Import Module";
module.Settings = _settings.GetSettings(EntityNames.Module, module.ModuleId).ToDictionary(x => x.SettingName, x => x.SettingValue);
var moduleobject = ActivatorUtilities.CreateInstance(_serviceProvider, moduletype);
((IPortable)moduleobject).ImportModule(module, modulecontent.Content, modulecontent.Version);