Merge pull request #9218 from abpframework/liangshiwei/setting-management

Use RequireFeatures

modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Menus/SettingManagementMenuContributor.cs

@@ -20,12 +20,6 @@ namespace Volo.Abp.SettingManagement.Blazor.Menus
 
         private async Task ConfigureMainMenuAsync(MenuConfigurationContext context)
         {
-            var featureChecker = context.ServiceProvider.GetRequiredService<IFeatureChecker>();
-            if (!await featureChecker.IsEnabledAsync(SettingManagementFeatures.Enable))
-            {
-                return;
-            }
-
             var settingManagementPageOptions = context.ServiceProvider.GetRequiredService<IOptions<SettingManagementComponentOptions>>().Value;
             var settingPageCreationContext = new SettingComponentCreationContext(context.ServiceProvider);
             if (!settingManagementPageOptions.Contributors.Any() ||
@@ -49,7 +43,7 @@ namespace Volo.Abp.SettingManagement.Blazor.Menus
                         l["Settings"],
                         "~/setting-management",
                         icon: "fa fa-cog"
-                    )
+                    ).RequireFeatures(SettingManagementFeatures.Enable)
                 );
         }
 

modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMainMenuContributor.cs

@@ -25,12 +25,6 @@ namespace Volo.Abp.SettingManagement.Web.Navigation
                 return;
             }
 
-            var featureChecker = context.ServiceProvider.GetRequiredService<IFeatureChecker>();
-            if (!await featureChecker.IsEnabledAsync(SettingManagementFeatures.Enable))
-            {
-                return;
-            }
-
             var settingManagementPageOptions = context.ServiceProvider.GetRequiredService<IOptions<SettingManagementPageOptions>>().Value;
             var settingPageCreationContext = new SettingPageCreationContext(context.ServiceProvider);
             if (!settingManagementPageOptions.Contributors.Any() ||
@@ -49,7 +43,7 @@ namespace Volo.Abp.SettingManagement.Web.Navigation
                         l["Settings"],
                         "~/SettingManagement",
                         icon: "fa fa-cog"
-                    )
+                    ).RequireFeatures(SettingManagementFeatures.Enable)
                 );
         }