Browse Source

Merge pull request #17874 from abpframework/auto-merge/rel-7-4/2226

Merge branch dev with rel-7.4
pull/17882/head
Enis Necipoglu 3 years ago
committed by GitHub
parent
commit
1f16df3fd4
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      modules/cms-kit/src/Volo.CmsKit.Public.Web/Menus/CmsKitPublicMenuContributor.cs

5
modules/cms-kit/src/Volo.CmsKit.Public.Web/Menus/CmsKitPublicMenuContributor.cs

@ -2,8 +2,10 @@
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Volo.Abp.Features;
using Volo.Abp.GlobalFeatures; using Volo.Abp.GlobalFeatures;
using Volo.Abp.UI.Navigation; using Volo.Abp.UI.Navigation;
using Volo.CmsKit.Features;
using Volo.CmsKit.GlobalFeatures; using Volo.CmsKit.GlobalFeatures;
using Volo.CmsKit.Menus; using Volo.CmsKit.Menus;
using Volo.CmsKit.Public.Menus; using Volo.CmsKit.Public.Menus;
@ -22,7 +24,8 @@ public class CmsKitPublicMenuContributor : IMenuContributor
private async Task ConfigureMainMenuAsync(MenuConfigurationContext context) private async Task ConfigureMainMenuAsync(MenuConfigurationContext context)
{ {
if (GlobalFeatureManager.Instance.IsEnabled<MenuFeature>()) var featureChecker = context.ServiceProvider.GetRequiredService<IFeatureChecker>();
if (GlobalFeatureManager.Instance.IsEnabled<MenuFeature>() && await featureChecker.IsEnabledAsync(CmsKitFeatures.MenuEnable))
{ {
var menuAppService = context.ServiceProvider.GetRequiredService<IMenuItemPublicAppService>(); var menuAppService = context.ServiceProvider.GetRequiredService<IMenuItemPublicAppService>();

Loading…
Cancel
Save