From 17af378d8a1ea5e31daaa8aa56b0992e295add24 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Thu, 23 Sep 2021 20:40:23 +0800
Subject: [PATCH] Check SettingManagementFeatures.

---
 .../SettingManagement/EmailSettingsAppService.cs  |  3 ++-
 .../Settings/EmailingPageContributor.cs           | 15 ++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo/Abp/SettingManagement/EmailSettingsAppService.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo/Abp/SettingManagement/EmailSettingsAppService.cs
index ca3297c87b..35266c4306 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo/Abp/SettingManagement/EmailSettingsAppService.cs
+++ b/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);
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/EmailingPageContributor.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/EmailingPageContributor.cs
index 1cbb75428c..dd596cab16 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/EmailingPageContributor.cs
+++ b/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>();
-
-            if (!currentTenant.IsAvailable)
+            var featureCheck = context.ServiceProvider.GetRequiredService<IFeatureChecker>();
+            if (!await featureCheck.IsEnabledAsync(SettingManagementFeatures.Enable))
             {
-                return true;
+                return false;
             }
 
-            var featureCheck = context.ServiceProvider.GetRequiredService<IFeatureChecker>();
-
-            return await featureCheck.IsEnabledAsync(SettingManagementFeatures.AllowTenantsToChangeEmailSettings);
+            if (context.ServiceProvider.GetRequiredService<ICurrentTenant>().IsAvailable)
+            {
+                return await featureCheck.IsEnabledAsync(SettingManagementFeatures.AllowTenantsToChangeEmailSettings);
+            }
 
+            return true;
         }
     }
 }