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 85f84dc724..dacc975bb0 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 @@ -70,7 +70,7 @@ - + @L["UserInformations"] @L["Roles"] @@ -141,7 +141,7 @@ - + @L["UserInformations"] @L["Roles"] 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 a239764837..e39c9fe567 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 @@ -12,6 +12,8 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity { protected const string PermissionProviderName = "U"; + protected const string DefaultSelectedTab = "UserInformations"; + protected PermissionManagementModal PermissionManagementModal; protected IReadOnlyList Roles; @@ -19,7 +21,11 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity protected AssignedRoleViewModel[] NewUserRoles; protected AssignedRoleViewModel[] EditUserRoles; - + + protected string _createModalSelectedTab = DefaultSelectedTab; + + protected string _editModalSelectedTab = DefaultSelectedTab; + public UserManagementBase() { ObjectMapperContext = typeof(AbpIdentityBlazorModule); @@ -34,6 +40,8 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity protected override Task OpenCreateModalAsync() { + _createModalSelectedTab = DefaultSelectedTab; + NewUserRoles = Roles.Select(x => new AssignedRoleViewModel { Name = x.Name, @@ -52,6 +60,8 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity protected override async Task OpenEditModalAsync(Guid id) { + _editModalSelectedTab = DefaultSelectedTab; + var userRoleNames = (await AppService.GetRolesAsync(id)).Items.Select(r => r.Name).ToList(); EditUserRoles = Roles.Select(x => new AssignedRoleViewModel