diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor index 5dccef1427..f89082404a 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor +++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor @@ -141,4 +141,7 @@ } - +@if (HasManagePermissionsPermission) +{ + +} diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs index 19478cff34..55e61bb023 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs +++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs @@ -12,12 +12,11 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity protected const string PermissionProviderName = "R"; protected PermissionManagementModal PermissionManagementModal; + protected string ManagePermissionsPolicyName; - + protected bool HasManagePermissionsPermission { get; set; } - protected bool ShouldShowEntityActions { get; set; } - public RoleManagement() { ObjectMapperContext = typeof(AbpIdentityBlazorModule); @@ -29,6 +28,13 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity ManagePermissionsPolicyName = IdentityPermissions.Roles.ManagePermissions; } + protected override async Task SetPermissionsAsync() + { + await base.SetPermissionsAsync(); + + HasManagePermissionsPermission = await AuthorizationService.IsGrantedAsync(IdentityPermissions.Roles.ManagePermissions); + } + protected override string GetDeleteConfirmationMessage(IdentityRoleDto entity) { return string.Format(L["RoleDeletionConfirmationMessage"], entity.Name); diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor index 51e1624e67..6697a341e5 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor +++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor @@ -286,4 +286,7 @@ } - \ No newline at end of file +@if (HasManagePermissionsPermission) +{ + +} \ No newline at end of file diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs index de852fe8eb..f0353051f0 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs +++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs @@ -24,6 +24,8 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity protected AssignedRoleViewModel[] EditUserRoles; protected string ManagePermissionsPolicyName; + + protected bool HasManagePermissionsPermission { get; set; } protected string CreateModalSelectedTab = DefaultSelectedTab; @@ -40,13 +42,19 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity ManagePermissionsPolicyName = IdentityPermissions.Users.ManagePermissions; } - protected async override Task OnInitializedAsync() + protected override async Task OnInitializedAsync() { await base.OnInitializedAsync(); Roles = (await AppService.GetAssignableRolesAsync()).Items; } + + protected override async Task SetPermissionsAsync() + { + await base.SetPermissionsAsync(); + HasManagePermissionsPermission = await AuthorizationService.IsGrantedAsync(IdentityPermissions.Users.ManagePermissions); + } protected override Task OpenCreateModalAsync() { @@ -69,7 +77,7 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity return base.OnCreatingEntityAsync(); } - protected async override Task OpenEditModalAsync(IdentityUserDto entity) + protected override async Task OpenEditModalAsync(IdentityUserDto entity) { EditModalSelectedTab = DefaultSelectedTab;