Browse Source

Check `TenantSideFeatures` only if tenant is available.

pull/13366/head
maliming 4 years ago
parent
commit
37ef2ccf7a
No known key found for this signature in database GPG Key ID: 96224957E51C89E
  1. 4
      modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorManager.cs

4
modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorManager.cs

@ -66,7 +66,9 @@ public class SettingPageContributorManager : IScopedDependency
if (available)
{
var requiredTenantSideFeatures = contributor.GetRequiredFeatures(MultiTenancySides.Tenant);
if (requiredTenantSideFeatures.Any() && !await featureChecker.IsEnabledAsync(true, requiredTenantSideFeatures.ToArray()))
if (requiredTenantSideFeatures.Any() &&
ServiceProvider.GetRequiredService<ICurrentTenant>().IsAvailable &&
!await featureChecker.IsEnabledAsync(true, requiredTenantSideFeatures.ToArray()))
{
available = false;
}

Loading…
Cancel
Save