Merge pull request #13366 from abpframework/TenantSideFeatures

maliming · web-flow · commit f17dfdc0f664 · 2022-07-22T13:14:43.000+08:00
Check `TenantSideFeatures` only if tenant is available.
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorManager.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorManager.cs
@@ -66,7 +66,9 @@ protected virtual async Task<List<ISettingPageContributor>> GetAvailableContribu
             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;
                 }

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,9 @@ protected virtual async Task<List<ISettingPageContributor>> GetAvailableContribu`
`66`	`66`	`if (available)`
`67`	`67`	`{`
`68`	`68`	`var requiredTenantSideFeatures = contributor.GetRequiredFeatures(MultiTenancySides.Tenant);`
`69`		`- if (requiredTenantSideFeatures.Any() && !await featureChecker.IsEnabledAsync(true, requiredTenantSideFeatures.ToArray()))`
	`69`	`+ if (requiredTenantSideFeatures.Any() &&`
	`70`	`+ ServiceProvider.GetRequiredService<ICurrentTenant>().IsAvailable &&`
	`71`	`+ !await featureChecker.IsEnabledAsync(true, requiredTenantSideFeatures.ToArray()))`
`70`	`72`	`{`
`71`	`73`	`available = false;`
`72`	`74`	`}`