diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorAutoMapperProfile.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorAutoMapperProfile.cs index d37ee863ba..bbe57e91fd 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorAutoMapperProfile.cs +++ b/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorAutoMapperProfile.cs @@ -7,6 +7,11 @@ namespace Volo.Abp.Identity.Blazor { public AbpIdentityBlazorAutoMapperProfile() { + CreateMap() + .MapExtraProperties() + .Ignore(x => x.Password) + .Ignore(x => x.RoleNames); + CreateMap() .MapExtraProperties(); 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 0b12a65227..4424633854 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 @@ -4,6 +4,7 @@ @using Microsoft.Extensions.Localization @using Volo.Abp.Application.Dtos @using Volo.Abp.Identity.Localization +@using Volo.Abp.PermissionManagement.Blazor.Components @inherits BlazorisePageBase @inject IStringLocalizer L @@ -35,6 +36,7 @@ @L["Edit"] + @L["Permissions"] @L["Delete"] @@ -89,7 +91,7 @@ @L["DisplayName:Password"] - + @L["DisplayName:Email"] @@ -107,9 +109,9 @@ - @if (NewEntityRoles != null) + @if (NewUserRoles != null) { - @foreach (var role in NewEntityRoles) + @foreach (var role in NewUserRoles) { @@ -160,7 +162,7 @@ @L["DisplayName:Password"] - + @L["DisplayName:Email"] @@ -178,9 +180,9 @@ - @if (EditEntityRoles != null) + @if (EditUserRoles != null) { - @foreach (var role in EditEntityRoles) + @foreach (var role in EditUserRoles) { @@ -197,4 +199,6 @@ - \ No newline at end of file + + + \ 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 cb616a90d3..0dd789012f 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 @@ -15,9 +15,9 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity protected IReadOnlyList Roles; - protected AssignedRoleViewModel[] NewEntityRoles; + protected AssignedRoleViewModel[] NewUserRoles; - protected AssignedRoleViewModel[] EditEntityRoles; + protected AssignedRoleViewModel[] EditUserRoles; public UserManagement() { @@ -34,7 +34,7 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity protected override void OpenCreateModal() { - NewEntityRoles = Roles.Select(x => new AssignedRoleViewModel + NewUserRoles = Roles.Select(x => new AssignedRoleViewModel { Name = x.Name, IsAssigned = x.IsDefault @@ -45,7 +45,7 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity protected override Task CreateEntityAsync() { - NewEntity.RoleNames = NewEntityRoles.Where(x => x.IsAssigned).Select(x => x.Name).ToArray(); + NewEntity.RoleNames = NewUserRoles.Where(x => x.IsAssigned).Select(x => x.Name).ToArray(); return base.CreateEntityAsync(); } @@ -54,7 +54,7 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity { var userRoleNames = (await AppService.GetRolesAsync(id)).Items.Select(r => r.Name).ToList(); - EditEntityRoles = Roles.Select(x => new AssignedRoleViewModel + EditUserRoles = Roles.Select(x => new AssignedRoleViewModel { Name = x.Name, IsAssigned = userRoleNames.Contains(x.Name) @@ -65,7 +65,7 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity protected override Task UpdateEntityAsync() { - EditingEntity.RoleNames = EditEntityRoles.Where(x => x.IsAssigned).Select(x => x.Name).ToArray(); + EditingEntity.RoleNames = EditUserRoles.Where(x => x.IsAssigned).Select(x => x.Name).ToArray(); return base.UpdateEntityAsync(); }