From e547740f14ad41ed56d44fa47b743ba67124c7d1 Mon Sep 17 00:00:00 2001 From: gdlcf88 Date: Fri, 19 Jan 2024 16:46:11 +0800 Subject: [PATCH] Use the fallback value when resetting a setting value --- src/EasyAbp.Abp.SettingUi.Application/SettingUiAppService.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/EasyAbp.Abp.SettingUi.Application/SettingUiAppService.cs b/src/EasyAbp.Abp.SettingUi.Application/SettingUiAppService.cs index cd2f0ec..fb4c853 100644 --- a/src/EasyAbp.Abp.SettingUi.Application/SettingUiAppService.cs +++ b/src/EasyAbp.Abp.SettingUi.Application/SettingUiAppService.cs @@ -7,6 +7,7 @@ using EasyAbp.Abp.SettingUi.Extensions; using EasyAbp.Abp.SettingUi.Localization; using EasyAbp.Abp.SettingUi.Options; +using JetBrains.Annotations; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.FileProviders; using Microsoft.Extensions.Localization; @@ -159,11 +160,11 @@ public virtual async Task ResetSettingValuesAsync(List settingNames) continue; } - await SetSettingAsync(setting, setting.DefaultValue); + await SetSettingAsync(setting, null); // use fallback value } } - protected virtual Task SetSettingAsync(SettingDefinition setting, string value) + protected virtual Task SetSettingAsync(SettingDefinition setting, [CanBeNull] string value) { if (setting.Providers.Any(p => p == UserSettingValueProvider.ProviderName)) {