Browse Source

fix tab-checkbox problem for user management modals

pull/5399/head
Ahmet Çotur 6 years ago
parent
commit
dd65d88d94
  1. 4
      modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
  2. 12
      modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs

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

@ -70,7 +70,7 @@
<CloseButton Clicked="CloseCreateModalAsync" /> <CloseButton Clicked="CloseCreateModalAsync" />
</ModalHeader> </ModalHeader>
<ModalBody> <ModalBody>
<Tabs SelectedTab="UserInformations"> <Tabs @bind-SelectedTab="@_createModalSelectedTab">
<Items> <Items>
<Tab Name="UserInformations">@L["UserInformations"]</Tab> <Tab Name="UserInformations">@L["UserInformations"]</Tab>
<Tab Name="Roles">@L["Roles"]</Tab> <Tab Name="Roles">@L["Roles"]</Tab>
@ -141,7 +141,7 @@
<ModalBody> <ModalBody>
<input type="hidden" name="ConcurrencyStamp" @bind-value="EditingEntity.ConcurrencyStamp" /> <input type="hidden" name="ConcurrencyStamp" @bind-value="EditingEntity.ConcurrencyStamp" />
<Tabs SelectedTab="UserInformations"> <Tabs @bind-SelectedTab="@_editModalSelectedTab">
<Items> <Items>
<Tab Name="UserInformations">@L["UserInformations"]</Tab> <Tab Name="UserInformations">@L["UserInformations"]</Tab>
<Tab Name="Roles">@L["Roles"]</Tab> <Tab Name="Roles">@L["Roles"]</Tab>

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

Loading…
Cancel
Save