Browse Source

Use role Id to determine `IsAssigned`.

pull/22513/head
maliming 2 years ago
parent
commit
a20d6c72ef
No known key found for this signature in database GPG Key ID: A646B9CB645ECEA4
  1. 4
      modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs
  2. 6
      modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml.cs

4
modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs

@ -129,12 +129,12 @@ public partial class UserManagement
if (await PermissionChecker.IsGrantedAsync(IdentityPermissions.Users.ManageRoles)) if (await PermissionChecker.IsGrantedAsync(IdentityPermissions.Users.ManageRoles))
{ {
var userRoleNames = (await AppService.GetRolesAsync(entity.Id)).Items.Select(r => r.Name).ToList(); var userRoleIds = (await AppService.GetRolesAsync(entity.Id)).Items.Select(r => r.Id).ToList();
EditUserRoles = Roles.Select(x => new AssignedRoleViewModel EditUserRoles = Roles.Select(x => new AssignedRoleViewModel
{ {
Name = x.Name, Name = x.Name,
IsAssigned = userRoleNames.Contains(x.Name) IsAssigned = userRoleIds.Contains(x.Id)
}).ToArray(); }).ToArray();
ChangePasswordTextRole(TextRole.Password); ChangePasswordTextRole(TextRole.Password);

6
modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml.cs

@ -45,10 +45,10 @@ public class EditModalModel : IdentityPageModel
} }
IsEditCurrentUser = CurrentUser.Id == id; IsEditCurrentUser = CurrentUser.Id == id;
var userRoleNames = (await IdentityUserAppService.GetRolesAsync(UserInfo.Id)).Items.Select(r => r.Name).ToList(); var userRoleIds = (await IdentityUserAppService.GetRolesAsync(UserInfo.Id)).Items.Select(r => r.Id).ToList();
foreach (var role in Roles) foreach (var role in Roles)
{ {
if (userRoleNames.Contains(role.Name)) if (userRoleIds.Contains(role.Id))
{ {
role.IsAssigned = true; role.IsAssigned = true;
} }
@ -122,6 +122,8 @@ public class EditModalModel : IdentityPageModel
public class AssignedRoleViewModel public class AssignedRoleViewModel
{ {
public Guid Id { get; set; }
[Required] [Required]
[HiddenInput] [HiddenInput]
public string Name { get; set; } public string Name { get; set; }

Loading…
Cancel
Save