Browse Source
Merge pull request #13366 from abpframework/TenantSideFeatures
Check `TenantSideFeatures` only if tenant is available.
pull/13370/head
maliming
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
3 additions and
1 deletions
-
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; |
|
|
|
} |
|
|
|
|
