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

Merge pull request #5751 from sbwalker/dev

Browse Source 
fix Settings update
This commit is contained in:
Shaun Walker
2025-10-29 16:29:38 -04:00
committed by GitHub
parent 431fa05763 1d3c1c158f
commit ed4ab703c0
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Oqtane.Server/Controllers/SettingController.cs
View File

@@ -218,9 +218,11 @@ namespace Oqtane.Controllers
var existingSettings = _settings.GetSettings(entityName, entityId).ToList(); var existingSettings = _settings.GetSettings(entityName, entityId).ToList();
foreach (Setting setting in settings) foreach (Setting setting in settings)
{ {
// note that setting.SettingId will be 0 if the Settings were converted from a Dictionary in the SettingService
Setting existing = existingSettings.FirstOrDefault(item => item.SettingName.Equals(setting.SettingName, StringComparison.OrdinalIgnoreCase)); Setting existing = existingSettings.FirstOrDefault(item => item.SettingName.Equals(setting.SettingName, StringComparison.OrdinalIgnoreCase));
if (existing == null) if (existing == null)
{ {
if (setting.SettingId == -1) setting.SettingId = 0;
existing = _settings.AddSetting(setting); existing = _settings.AddSetting(setting);
AddSyncEvent(existing.EntityName, existing.EntityId, existing.SettingId, SyncEventActions.Create); AddSyncEvent(existing.EntityName, existing.EntityId, existing.SettingId, SyncEventActions.Create);
_logger.Log(LogLevel.Information, this, LogFunction.Update, "Setting Created {Setting}", existing); _logger.Log(LogLevel.Information, this, LogFunction.Update, "Setting Created {Setting}", existing);
@@ -228,7 +230,6 @@ namespace Oqtane.Controllers
} }
else else
{ {
// note that SettingId will pnly be 0 if the Settings were converted from a Dictionary in the SettingService
if (existing.SettingValue != setting.SettingValue || (existing.IsPrivate != setting.IsPrivate && setting.SettingId != 0)) if (existing.SettingValue != setting.SettingValue || (existing.IsPrivate != setting.IsPrivate && setting.SettingId != 0))
{ {
existing.SettingValue = setting.SettingValue; existing.SettingValue = setting.SettingValue;