tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix: #5822

pull/6045/head
Ahmet 6 years ago
parent
4b88df691f
commit
a5104699cb
2 changed files with 239 additions and 231 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 92
      modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
  2. 378
      modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor

92
modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
View File

@ -73,52 +73,17 @@
<Modal @ref="CreateModal"> <Modal @ref="CreateModal">
<ModalBackdrop /> <ModalBackdrop />
<ModalContent Centered="true"> <ModalContent Centered="true">
<ModalHeader> <Form id="RoleCreateForm">
<ModalTitle>@L["NewRole"]</ModalTitle>
<CloseButton Clicked="CloseCreateModalAsync" />
</ModalHeader>
<ModalBody>
<Validations @ref="@CreateValidationsRef" Model="@NewEntity" ValidateOnLoad="false">
<Validation MessageLocalizer="@LH.Localize">
<Field>
<FieldLabel>@L["DisplayName:RoleName"]</FieldLabel>
<TextEdit @bind-Text="@NewEntity.Name">
<Feedback>
<ValidationError />
</Feedback>
</TextEdit>
</Field>
</Validation>
<Field>
<Check TValue="bool" @bind-Checked="@NewEntity.IsDefault">@L["DisplayName:IsDefault"]</Check>
<Check TValue="bool" @bind-Checked="@NewEntity.IsPublic">@L["DisplayName:IsPublic"]</Check>
</Field>
</Validations>
</ModalBody>
<ModalFooter>
<Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
<Button Color="Color.Primary" Clicked="CreateEntityAsync">@L["Save"]</Button>
</ModalFooter>
</ModalContent>
</Modal>
}
@* ************************* EDIT MODAL ************************* *@
@if (HasUpdatePermission)
{
<Modal @ref="EditModal">
<ModalBackdrop />
<ModalContent Centered="true">
<ModalHeader> <ModalHeader>
<ModalTitle>@L["Edit"]</ModalTitle> <ModalTitle>@L["NewRole"]</ModalTitle>
<CloseButton Clicked="CloseEditModalAsync" /> <CloseButton Clicked="CloseCreateModalAsync" />
</ModalHeader> </ModalHeader>
<ModalBody> <ModalBody>
<Validations @ref="@EditValidationsRef" Model="@EditingEntity" ValidateOnLoad="false"> <Validations @ref="@CreateValidationsRef" Model="@NewEntity" ValidateOnLoad="false">
<input type="hidden" name="ConcurrencyStamp" @bind-value="EditingEntity.ConcurrencyStamp" />
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@L["DisplayName:RoleName"]</FieldLabel> <FieldLabel>@L["DisplayName:RoleName"]</FieldLabel>
<TextEdit @bind-Text="EditingEntity.Name"> <TextEdit @bind-Text="@NewEntity.Name">
<Feedback> <Feedback>
<ValidationError /> <ValidationError />
</Feedback> </Feedback>
@ -126,15 +91,54 @@
</Field> </Field>
</Validation> </Validation>
<Field> <Field>
<Check TValue="bool" @bind-Checked="@EditingEntity.IsDefault">@L["DisplayName:IsDefault"]</Check> <Check TValue="bool" @bind-Checked="@NewEntity.IsDefault">@L["DisplayName:IsDefault"]</Check>
<Check TValue="bool" @bind-Checked="@EditingEntity.IsPublic">@L["DisplayName:IsPublic"]</Check> <Check TValue="bool" @bind-Checked="@NewEntity.IsPublic">@L["DisplayName:IsPublic"]</Check>
</Field> </Field>
</Validations> </Validations>
</ModalBody> </ModalBody>
<ModalFooter> <ModalFooter>
<Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button> <Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
<Button Color="Color.Primary" Clicked="UpdateEntityAsync">@L["Save"]</Button> <Button form="RoleCreateForm" Type="ButtonType.Submit" PreventDefaultOnSubmit="true" Color="Color.Primary" Clicked="CreateEntityAsync">@L["Save"]</Button>
</ModalFooter> </ModalFooter>
</Form>
</ModalContent>
</Modal>
}
@* ************************* EDIT MODAL ************************* *@
@if (HasUpdatePermission)
{
<Modal @ref="EditModal">
<ModalBackdrop />
<ModalContent Centered="true">
<Form id="RoleEditForm">
<ModalHeader>
<ModalTitle>@L["Edit"]</ModalTitle>
<CloseButton Clicked="CloseEditModalAsync" />
</ModalHeader>
<ModalBody>
<Validations @ref="@EditValidationsRef" Model="@EditingEntity" ValidateOnLoad="false">
<input type="hidden" name="ConcurrencyStamp" @bind-value="EditingEntity.ConcurrencyStamp" />
<Validation MessageLocalizer="@LH.Localize">
<Field>
<FieldLabel>@L["DisplayName:RoleName"]</FieldLabel>
<TextEdit @bind-Text="EditingEntity.Name">
<Feedback>
<ValidationError />
</Feedback>
</TextEdit>
</Field>
</Validation>
<Field>
<Check TValue="bool" @bind-Checked="@EditingEntity.IsDefault">@L["DisplayName:IsDefault"]</Check>
<Check TValue="bool" @bind-Checked="@EditingEntity.IsPublic">@L["DisplayName:IsPublic"]</Check>
</Field>
</Validations>
</ModalBody>
<ModalFooter>
<Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
<Button form="RoleEditForm" Type="ButtonType.Submit" PreventDefaultOnSubmit="true" Color="Color.Primary" Clicked="UpdateEntityAsync">@L["Save"]</Button>
</ModalFooter>
</Form>
</ModalContent> </ModalContent>
</Modal> </Modal>
} }

378
modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
View File

@ -74,103 +74,105 @@
<Modal @ref="CreateModal"> <Modal @ref="CreateModal">
<ModalBackdrop /> <ModalBackdrop />
<ModalContent Centered="true"> <ModalContent Centered="true">
<ModalHeader> <Form id="UserCreateForm">
<ModalTitle>@L["NewUser"]</ModalTitle> <ModalHeader>
<CloseButton Clicked="CloseCreateModalAsync" /> <ModalTitle>@L["NewUser"]</ModalTitle>
</ModalHeader> <CloseButton Clicked="CloseCreateModalAsync" />
<ModalBody> </ModalHeader>
<Validations @ref="@CreateValidationsRef" Model="@NewEntity" ValidateOnLoad="false"> <ModalBody>
<Tabs @bind-SelectedTab="@CreateModalSelectedTab"> <Validations @ref="@CreateValidationsRef" Model="@NewEntity" ValidateOnLoad="false">
<Items> <Tabs @bind-SelectedTab="@CreateModalSelectedTab">
<Tab Name="UserInformations">@L["UserInformations"]</Tab> <Items>
<Tab Name="Roles">@L["Roles"]</Tab> <Tab Name="UserInformations">@L["UserInformations"]</Tab>
</Items> <Tab Name="Roles">@L["Roles"]</Tab>
<Content> </Items>
<TabPanel Name="UserInformations"> <Content>
<Validation MessageLocalizer="@LH.Localize"> <TabPanel Name="UserInformations">
<Field> <Validation MessageLocalizer="@LH.Localize">
<FieldLabel>@L["DisplayName:UserName"]</FieldLabel> <Field>
<TextEdit @bind-Text="NewEntity.UserName"> <FieldLabel>@L["DisplayName:UserName"]</FieldLabel>
<Feedback> <TextEdit @bind-Text="NewEntity.UserName">
<ValidationError /> <Feedback>
</Feedback> <ValidationError />
</TextEdit> </Feedback>
</Field> </TextEdit>
</Validation> </Field>
<Validation MessageLocalizer="@LH.Localize"> </Validation>
<Field> <Validation MessageLocalizer="@LH.Localize">
<FieldLabel>@L["DisplayName:Name"]</FieldLabel> <Field>
<TextEdit @bind-Text="NewEntity.Name"> <FieldLabel>@L["DisplayName:Name"]</FieldLabel>
<Feedback> <TextEdit @bind-Text="NewEntity.Name">
<ValidationError /> <Feedback>
</Feedback> <ValidationError />
</TextEdit> </Feedback>
</Field> </TextEdit>
</Validation> </Field>
<Validation MessageLocalizer="@LH.Localize"> </Validation>
<Field> <Validation MessageLocalizer="@LH.Localize">
<FieldLabel>@L["DisplayName:Surname"]</FieldLabel> <Field>
<TextEdit @bind-Text="NewEntity.Surname"> <FieldLabel>@L["DisplayName:Surname"]</FieldLabel>
<Feedback> <TextEdit @bind-Text="NewEntity.Surname">
<ValidationError /> <Feedback>
</Feedback> <ValidationError />
</TextEdit> </Feedback>
</Field> </TextEdit>
</Validation> </Field>
<Validation MessageLocalizer="@LH.Localize"> </Validation>
<Field> <Validation MessageLocalizer="@LH.Localize">
<FieldLabel>@L["DisplayName:Password"]</FieldLabel> <Field>
<TextEdit Role="TextRole.Password" @bind-Text="NewEntity.Password"> <FieldLabel>@L["DisplayName:Password"]</FieldLabel>
<Feedback> <TextEdit Role="TextRole.Password" @bind-Text="NewEntity.Password">
<ValidationError /> <Feedback>
</Feedback> <ValidationError />
</TextEdit> </Feedback>
</Field> </TextEdit>
</Validation> </Field>
<Validation MessageLocalizer="@LH.Localize"> </Validation>
<Field> <Validation MessageLocalizer="@LH.Localize">
<FieldLabel>@L["DisplayName:Email"]</FieldLabel> <Field>
<TextEdit @bind-Text="NewEntity.Email"> <FieldLabel>@L["DisplayName:Email"]</FieldLabel>
<Feedback> <TextEdit @bind-Text="NewEntity.Email">
<ValidationError /> <Feedback>
</Feedback> <ValidationError />
</TextEdit> </Feedback>
</Field> </TextEdit>
</Validation> </Field>
<Validation MessageLocalizer="@LH.Localize"> </Validation>
<Validation MessageLocalizer="@LH.Localize">
<Field>
<FieldLabel>@L["DisplayName:PhoneNumber"]</FieldLabel>
<TextEdit @bind-Text="NewEntity.PhoneNumber">
<Feedback>
<ValidationError />
</Feedback>
</TextEdit>
</Field>
</Validation>
<Field> <Field>
<FieldLabel>@L["DisplayName:PhoneNumber"]</FieldLabel> <Check TValue="bool" @bind-Checked="@NewEntity.LockoutEnabled">@L["DisplayName:LockoutEnabled"]</Check>
<TextEdit @bind-Text="NewEntity.PhoneNumber">
<Feedback>
<ValidationError />
</Feedback>
</TextEdit>
</Field> </Field>
</Validation> </TabPanel>
<Field> <TabPanel Name="Roles">
<Check TValue="bool" @bind-Checked="@NewEntity.LockoutEnabled">@L["DisplayName:LockoutEnabled"]</Check> @if (NewUserRoles != null)
</Field>
</TabPanel>
<TabPanel Name="Roles">
@if (NewUserRoles != null)
{
@foreach (var role in NewUserRoles)
{ {
<Field> @foreach (var role in NewUserRoles)
<input type="hidden" @bind-value="@role.Name" /> {
<Check TValue="bool" @bind-Checked="@role.IsAssigned">@role.Name</Check> <Field>
</Field> <input type="hidden" @bind-value="@role.Name" />
<Check TValue="bool" @bind-Checked="@role.IsAssigned">@role.Name</Check>
</Field>
}
} }
} </TabPanel>
</TabPanel> </Content>
</Content> </Tabs>
</Tabs> </Validations>
</Validations> </ModalBody>
</ModalBody> <ModalFooter>
<ModalFooter> <Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
<Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button> <Button form="UserCreateForm" Type="ButtonType.Submit" PreventDefaultOnSubmit="true" Color="Color.Primary" Clicked="CreateEntityAsync">@L["Save"]</Button>
<Button Color="Color.Primary" Clicked="CreateEntityAsync">@L["Save"]</Button> </ModalFooter>
</ModalFooter> </Form>
</ModalContent> </ModalContent>
</Modal> </Modal>
} }
@ -181,105 +183,107 @@
<Modal @ref="EditModal"> <Modal @ref="EditModal">
<ModalBackdrop /> <ModalBackdrop />
<ModalContent Centered="true"> <ModalContent Centered="true">
<ModalHeader> <Form id="UserEditForm">
<ModalTitle>@L["Edit"]</ModalTitle> <ModalHeader>
<CloseButton Clicked="CloseEditModalAsync" /> <ModalTitle>@L["Edit"]</ModalTitle>
</ModalHeader> <CloseButton Clicked="CloseEditModalAsync" />
<ModalBody> </ModalHeader>
<Validations @ref="@EditValidationsRef" Model="@EditingEntity" ValidateOnLoad="false"> <ModalBody>
<input type="hidden" name="ConcurrencyStamp" @bind-value="EditingEntity.ConcurrencyStamp" /> <Validations @ref="@EditValidationsRef" Model="@EditingEntity" ValidateOnLoad="false">
<input type="hidden" name="ConcurrencyStamp" @bind-value="EditingEntity.ConcurrencyStamp" />
<Tabs @bind-SelectedTab="@EditModalSelectedTab"> <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>
</Items> </Items>
<Content> <Content>
<TabPanel Name="UserInformations"> <TabPanel Name="UserInformations">
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@L["DisplayName:UserName"]</FieldLabel> <FieldLabel>@L["DisplayName:UserName"]</FieldLabel>
<TextEdit @bind-Text="EditingEntity.UserName"> <TextEdit @bind-Text="EditingEntity.UserName">
<Feedback> <Feedback>
<ValidationError /> <ValidationError />
</Feedback> </Feedback>
</TextEdit> </TextEdit>
</Field> </Field>
</Validation> </Validation>
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@L["DisplayName:Name"]</FieldLabel> <FieldLabel>@L["DisplayName:Name"]</FieldLabel>
<TextEdit @bind-Text="EditingEntity.Name"> <TextEdit @bind-Text="EditingEntity.Name">
<Feedback> <Feedback>
<ValidationError /> <ValidationError />
</Feedback> </Feedback>
</TextEdit> </TextEdit>
</Field> </Field>
</Validation> </Validation>
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@L["DisplayName:Surname"]</FieldLabel> <FieldLabel>@L["DisplayName:Surname"]</FieldLabel>
<TextEdit @bind-Text="EditingEntity.Surname"> <TextEdit @bind-Text="EditingEntity.Surname">
<Feedback> <Feedback>
<ValidationError /> <ValidationError />
</Feedback> </Feedback>
</TextEdit> </TextEdit>
</Field> </Field>
</Validation> </Validation>
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@L["DisplayName:Password"]</FieldLabel> <FieldLabel>@L["DisplayName:Password"]</FieldLabel>
<TextEdit Role="TextRole.Password" @bind-Text="EditingEntity.Password"> <TextEdit Role="TextRole.Password" @bind-Text="EditingEntity.Password">
<Feedback> <Feedback>
<ValidationError /> <ValidationError />
</Feedback> </Feedback>
</TextEdit> </TextEdit>
</Field> </Field>
</Validation> </Validation>
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@L["DisplayName:Email"]</FieldLabel> <FieldLabel>@L["DisplayName:Email"]</FieldLabel>
<TextEdit @bind-Text="EditingEntity.Email"> <TextEdit @bind-Text="EditingEntity.Email">
<Feedback> <Feedback>
<ValidationError /> <ValidationError />
</Feedback> </Feedback>
</TextEdit> </TextEdit>
</Field> </Field>
</Validation> </Validation>
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field>
<FieldLabel>@L["DisplayName:PhoneNumber"]</FieldLabel>
<TextEdit @bind-Text="EditingEntity.PhoneNumber">
<Feedback>
<ValidationError />
</Feedback>
</TextEdit>
</Field>
</Validation>
<Field> <Field>
<FieldLabel>@L["DisplayName:PhoneNumber"]</FieldLabel> <Check TValue="bool" @bind-Checked="EditingEntity.LockoutEnabled">@L["DisplayName:LockoutEnabled"]</Check>
<TextEdit @bind-Text="EditingEntity.PhoneNumber">
<Feedback>
<ValidationError />
</Feedback>
</TextEdit>
</Field> </Field>
</Validation> </TabPanel>
<Field> <TabPanel Name="Roles">
<Check TValue="bool" @bind-Checked="EditingEntity.LockoutEnabled">@L["DisplayName:LockoutEnabled"]</Check> @if (EditUserRoles != null)
</Field>
</TabPanel>
<TabPanel Name="Roles">
@if (EditUserRoles != null)
{
@foreach (var role in EditUserRoles)
{ {
<Field> @foreach (var role in EditUserRoles)
<input type="hidden" @bind-value="@role.Name" /> {
<Check TValue="bool" @bind-Checked="@role.IsAssigned">@role.Name</Check> <Field>
</Field> <input type="hidden" @bind-value="@role.Name" />
<Check TValue="bool" @bind-Checked="@role.IsAssigned">@role.Name</Check>
</Field>
}
} }
} </TabPanel>
</TabPanel> </Content>
</Content> </Tabs>
</Tabs> </Validations>
</Validations> </ModalBody>
</ModalBody> <ModalFooter>
<ModalFooter> <Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
<Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button> <Button form="UserEditForm" Type="ButtonType.Submit" PreventDefaultOnSubmit="true" Color="Color.Primary" Clicked="UpdateEntityAsync">@L["Save"]</Button>
<Button Color="Color.Primary" Clicked="UpdateEntityAsync">@L["Save"]</Button> </ModalFooter>
</ModalFooter> </Form>
</ModalContent> </ModalContent>
</Modal> </Modal>
} }

Write Preview
Loading…
Cancel
Save