Merge pull request #10128 from abpframework/maliming/setting-feature

modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo/Abp/SettingManagement/EmailSettingsAppService.cs

@@ -59,8 +59,9 @@ namespace Volo.Abp.SettingManagement
             await SettingManager.SetForTenantOrGlobalAsync(CurrentTenant.Id, EmailSettingNames.DefaultFromDisplayName, input.DefaultFromDisplayName);
         }
 
-        private async Task CheckFeatureAsync()
+        protected virtual async Task CheckFeatureAsync()
         {
+            await FeatureChecker.CheckEnabledAsync(SettingManagementFeatures.Enable);
             if (CurrentTenant.IsAvailable)
             {
                 await FeatureChecker.CheckEnabledAsync(SettingManagementFeatures.AllowTenantsToChangeEmailSettings);

modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/EmailingPageContributor.cs

@@ -48,17 +48,18 @@ namespace Volo.Abp.SettingManagement.Web.Settings
 
         private async Task<bool> CheckFeatureAsync(SettingPageCreationContext context)
         {
-            var currentTenant = context.ServiceProvider.GetRequiredService<ICurrentTenant>();
+            var featureCheck = context.ServiceProvider.GetRequiredService<IFeatureChecker>();
-
+            if (!await featureCheck.IsEnabledAsync(SettingManagementFeatures.Enable))
-            if (!currentTenant.IsAvailable)
             {
-                return true;
+                return false;
             }
 
-            var featureCheck = context.ServiceProvider.GetRequiredService<IFeatureChecker>();
+            if (context.ServiceProvider.GetRequiredService<ICurrentTenant>().IsAvailable)
-
+            {
-            return await featureCheck.IsEnabledAsync(SettingManagementFeatures.AllowTenantsToChangeEmailSettings);
+                return await featureCheck.IsEnabledAsync(SettingManagementFeatures.AllowTenantsToChangeEmailSettings);
+            }
 
+            return true;
         }
     }
 }