Browse Source

Merge pull request #21510 from abpframework/auto-merge/rel-9-0/3257

Merge branch dev with rel-9.0
pull/21523/head
maliming 1 year ago
committed by GitHub
parent
commit
e0d3bfec48
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 5
      modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Settings/TimeZonePageContributor.cs

5
modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Settings/TimeZonePageContributor.cs

@ -14,7 +14,7 @@ public class TimeZonePageContributor : ISettingComponentContributor
public async Task ConfigureAsync(SettingComponentCreationContext context)
{
var l = context.ServiceProvider.GetRequiredService<IStringLocalizer<AbpSettingManagementResource>>();
if (context.ServiceProvider.GetRequiredService<IClock>().SupportsMultipleTimezone)
if (await CheckPermissionsAsync(context))
{
context.Groups.Add(
new SettingComponentGroup(
@ -30,6 +30,7 @@ public class TimeZonePageContributor : ISettingComponentContributor
{
var authorizationService = context.ServiceProvider.GetRequiredService<IAuthorizationService>();
return await authorizationService.IsGrantedAsync(SettingManagementPermissions.TimeZone);
return context.ServiceProvider.GetRequiredService<IClock>().SupportsMultipleTimezone
&& await authorizationService.IsGrantedAsync(SettingManagementPermissions.TimeZone);
}
}

Loading…
Cancel
Save