Merge pull request #106 from EasyAbp/use-fallback-value

Use the fallback value when resetting a setting value
EasyAbp · Jan 19, 2024 · 00e2d57 · 00e2d57
2 parents ca7b5f0 + e547740
commit 00e2d57
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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<string> 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))
 			{