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

Merge pull request #15240 from abpframework/Search-location-14973 

Moving the searching input to right
pull/15330/head
Gizem Mutu Kurt 4 years ago
committed by GitHub
parent
445bff6d58 08bf0fc505
commit
4582350196
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 41 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. 84
      modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor

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

@ -16,15 +16,17 @@
BreadcrumbItems="@BreadcrumbItems" BreadcrumbItems="@BreadcrumbItems"
Toolbar="@Toolbar" /> Toolbar="@Toolbar" />
</CardHeader> </CardHeader>
<CardBody> <CardBody class="row">
<Row>
<Column ColumnSize="ColumnSize.Is3"> <Column ColumnSize="ColumnSize.Is8">
<Field> </Column>
<FieldLabel>@L["Search"]</FieldLabel> <Column ColumnSize="ColumnSize.Is4" class="form-group row" style="text-align:right;">
<TextEdit Size="Size.Small" Text="@GetListInput.Filter" TextChanged="@OnSearchTextChanged" /> <label for="inputPassword" class="col-sm-4 col-form-label pt-1"> @L["Search"] </label>
</Field> <div class="col-sm-8">
</Column> <TextEdit class="form-control-sm" id="inputPassword" Text="@GetListInput.Filter" TextChanged="@OnSearchTextChanged" />
</Row> </div>
</Column>
@* ************************* DATA GRID ************************* *@ @* ************************* DATA GRID ************************* *@
<AbpExtensibleDataGrid TItem="IdentityUserDto" <AbpExtensibleDataGrid TItem="IdentityUserDto"
Data="Entities" Data="Entities"
@ -39,14 +41,14 @@
</Card> </Card>
@* ************************* CREATE MODAL ************************* *@ @* ************************* CREATE MODAL ************************* *@
@if ( HasCreatePermission ) @if (HasCreatePermission)
{ {
<Modal @ref="CreateModal" Closing="@ClosingCreateModal"> <Modal @ref="CreateModal" Closing="@ClosingCreateModal">
<ModalContent Centered="true"> <ModalContent Centered="true">
<Form> <Form>
<ModalHeader> <ModalHeader>
<ModalTitle>@L["NewUser"]</ModalTitle> <ModalTitle>@L["NewUser"]</ModalTitle>
<CloseButton Clicked="CloseCreateModalAsync"/> <CloseButton Clicked="CloseCreateModalAsync" />
</ModalHeader> </ModalHeader>
<ModalBody> <ModalBody>
<Validations @ref="@CreateValidationsRef" Model="@NewEntity" ValidateOnLoad="false"> <Validations @ref="@CreateValidationsRef" Model="@NewEntity" ValidateOnLoad="false">
@ -62,7 +64,7 @@
<FieldLabel>@L["DisplayName:UserName"]</FieldLabel> <FieldLabel>@L["DisplayName:UserName"]</FieldLabel>
<TextEdit @bind-Text="NewEntity.UserName" Autofocus="true"> <TextEdit @bind-Text="NewEntity.UserName" Autofocus="true">
<Feedback> <Feedback>
<ValidationError/> <ValidationError />
</Feedback> </Feedback>
</TextEdit> </TextEdit>
</Field> </Field>
@ -72,7 +74,7 @@
<FieldLabel>@L["DisplayName:Name"]</FieldLabel> <FieldLabel>@L["DisplayName:Name"]</FieldLabel>
<TextEdit @bind-Text="NewEntity.Name"> <TextEdit @bind-Text="NewEntity.Name">
<Feedback> <Feedback>
<ValidationError/> <ValidationError />
</Feedback> </Feedback>
</TextEdit> </TextEdit>
</Field> </Field>
@ -82,7 +84,7 @@
<FieldLabel>@L["DisplayName:Surname"]</FieldLabel> <FieldLabel>@L["DisplayName:Surname"]</FieldLabel>
<TextEdit @bind-Text="NewEntity.Surname"> <TextEdit @bind-Text="NewEntity.Surname">
<Feedback> <Feedback>
<ValidationError/> <ValidationError />
</Feedback> </Feedback>
</TextEdit> </TextEdit>
</Field> </Field>
@ -96,10 +98,10 @@
</TextEdit> </TextEdit>
</Addon> </Addon>
<Addon AddonType="AddonType.End"> <Addon AddonType="AddonType.End">
<Button Color="Color.Secondary" Clicked="@(() => ChangePasswordTextRole(null))"><Icon Name="IconName.EyeSlash"/></Button> <Button Color="Color.Secondary" Clicked="@(() => ChangePasswordTextRole(null))"><Icon Name="IconName.EyeSlash" /></Button>
</Addon> </Addon>
</Addons> </Addons>
<ValidationError Style="display: block"/> <ValidationError Style="display: block" />
</Field> </Field>
</Validation> </Validation>
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
@ -107,7 +109,7 @@
<FieldLabel>@L["DisplayName:Email"]</FieldLabel> <FieldLabel>@L["DisplayName:Email"]</FieldLabel>
<TextEdit @bind-Text="NewEntity.Email"> <TextEdit @bind-Text="NewEntity.Email">
<Feedback> <Feedback>
<ValidationError/> <ValidationError />
</Feedback> </Feedback>
</TextEdit> </TextEdit>
</Field> </Field>
@ -117,7 +119,7 @@
<FieldLabel>@L["DisplayName:PhoneNumber"]</FieldLabel> <FieldLabel>@L["DisplayName:PhoneNumber"]</FieldLabel>
<TextEdit @bind-Text="NewEntity.PhoneNumber"> <TextEdit @bind-Text="NewEntity.PhoneNumber">
<Feedback> <Feedback>
<ValidationError/> <ValidationError />
</Feedback> </Feedback>
</TextEdit> </TextEdit>
</Field> </Field>
@ -128,15 +130,15 @@
<Field> <Field>
<Check TValue="bool" @bind-Checked="@NewEntity.LockoutEnabled">@L["DisplayName:LockoutEnabled"]</Check> <Check TValue="bool" @bind-Checked="@NewEntity.LockoutEnabled">@L["DisplayName:LockoutEnabled"]</Check>
</Field> </Field>
<ExtensionProperties TEntityType="IdentityUserCreateDto" TResourceType="IdentityResource" Entity="@NewEntity" LH="@LH"/> <ExtensionProperties TEntityType="IdentityUserCreateDto" TResourceType="IdentityResource" Entity="@NewEntity" LH="@LH" />
</TabPanel> </TabPanel>
<TabPanel Name="Roles"> <TabPanel Name="Roles">
@if ( NewUserRoles != null ) @if (NewUserRoles != null)
{ {
@foreach ( var role in NewUserRoles ) @foreach (var role in NewUserRoles)
{ {
<Field> <Field>
<input type="hidden" @bind-value="@role.Name"/> <input type="hidden" @bind-value="@role.Name" />
<Check TValue="bool" @bind-Checked="@role.IsAssigned">@role.Name</Check> <Check TValue="bool" @bind-Checked="@role.IsAssigned">@role.Name</Check>
</Field> </Field>
} }
@ -148,7 +150,7 @@
</ModalBody> </ModalBody>
<ModalFooter> <ModalFooter>
<Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button> <Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
<SubmitButton Clicked="@CreateEntityAsync"/> <SubmitButton Clicked="@CreateEntityAsync" />
</ModalFooter> </ModalFooter>
</Form> </Form>
</ModalContent> </ModalContent>
@ -156,18 +158,18 @@
} }
@* ************************* EDIT MODAL ************************* *@ @* ************************* EDIT MODAL ************************* *@
@if ( HasUpdatePermission ) @if (HasUpdatePermission)
{ {
<Modal @ref="EditModal" Closing="@ClosingEditModal"> <Modal @ref="EditModal" Closing="@ClosingEditModal">
<ModalContent Centered="true"> <ModalContent Centered="true">
<Form> <Form>
<ModalHeader> <ModalHeader>
<ModalTitle>@L["Edit"]</ModalTitle> <ModalTitle>@L["Edit"]</ModalTitle>
<CloseButton Clicked="CloseEditModalAsync"/> <CloseButton Clicked="CloseEditModalAsync" />
</ModalHeader> </ModalHeader>
<ModalBody> <ModalBody>
<Validations @ref="@EditValidationsRef" Model="@EditingEntity" ValidateOnLoad="false"> <Validations @ref="@EditValidationsRef" Model="@EditingEntity" ValidateOnLoad="false">
<input type="hidden" name="ConcurrencyStamp" @bind-value="EditingEntity.ConcurrencyStamp"/> <input type="hidden" name="ConcurrencyStamp" @bind-value="EditingEntity.ConcurrencyStamp" />
<Tabs @bind-SelectedTab="@EditModalSelectedTab"> <Tabs @bind-SelectedTab="@EditModalSelectedTab">
<Items> <Items>
@ -181,7 +183,7 @@
<FieldLabel>@L["DisplayName:UserName"]</FieldLabel> <FieldLabel>@L["DisplayName:UserName"]</FieldLabel>
<TextEdit @bind-Text="EditingEntity.UserName" Autofocus="true"> <TextEdit @bind-Text="EditingEntity.UserName" Autofocus="true">
<Feedback> <Feedback>
<ValidationError/> <ValidationError />
</Feedback> </Feedback>
</TextEdit> </TextEdit>
</Field> </Field>
@ -191,7 +193,7 @@
<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>
@ -201,7 +203,7 @@
<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>
@ -215,10 +217,10 @@
</TextEdit> </TextEdit>
</Addon> </Addon>
<Addon AddonType="AddonType.End"> <Addon AddonType="AddonType.End">
<Button Color="Color.Secondary" Clicked="@(() => ChangePasswordTextRole(null))"><Icon Name="IconName.EyeSlash"/></Button> <Button Color="Color.Secondary" Clicked="@(() => ChangePasswordTextRole(null))"><Icon Name="IconName.EyeSlash" /></Button>
</Addon> </Addon>
</Addons> </Addons>
<ValidationError Style="display: block"/> <ValidationError Style="display: block" />
</Field> </Field>
</Validation> </Validation>
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
@ -226,7 +228,7 @@
<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>
@ -236,7 +238,7 @@
<FieldLabel>@L["DisplayName:PhoneNumber"]</FieldLabel> <FieldLabel>@L["DisplayName:PhoneNumber"]</FieldLabel>
<TextEdit @bind-Text="EditingEntity.PhoneNumber"> <TextEdit @bind-Text="EditingEntity.PhoneNumber">
<Feedback> <Feedback>
<ValidationError/> <ValidationError />
</Feedback> </Feedback>
</TextEdit> </TextEdit>
</Field> </Field>
@ -247,15 +249,15 @@
<Field> <Field>
<Check TValue="bool" @bind-Checked="EditingEntity.LockoutEnabled">@L["DisplayName:LockoutEnabled"]</Check> <Check TValue="bool" @bind-Checked="EditingEntity.LockoutEnabled">@L["DisplayName:LockoutEnabled"]</Check>
</Field> </Field>
<ExtensionProperties TEntityType="IdentityUserUpdateDto" TResourceType="IdentityResource" Entity="@EditingEntity" LH="@LH"/> <ExtensionProperties TEntityType="IdentityUserUpdateDto" TResourceType="IdentityResource" Entity="@EditingEntity" LH="@LH" />
</TabPanel> </TabPanel>
<TabPanel Name="Roles"> <TabPanel Name="Roles">
@if ( EditUserRoles != null ) @if (EditUserRoles != null)
{ {
@foreach ( var role in EditUserRoles ) @foreach (var role in EditUserRoles)
{ {
<Field> <Field>
<input type="hidden" @bind-value="@role.Name"/> <input type="hidden" @bind-value="@role.Name" />
<Check TValue="bool" @bind-Checked="@role.IsAssigned">@role.Name</Check> <Check TValue="bool" @bind-Checked="@role.IsAssigned">@role.Name</Check>
</Field> </Field>
} }
@ -267,14 +269,14 @@
</ModalBody> </ModalBody>
<ModalFooter> <ModalFooter>
<Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button> <Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
<SubmitButton Clicked="@UpdateEntityAsync"/> <SubmitButton Clicked="@UpdateEntityAsync" />
</ModalFooter> </ModalFooter>
</Form> </Form>
</ModalContent> </ModalContent>
</Modal> </Modal>
} }
@if ( HasManagePermissionsPermission ) @if (HasManagePermissionsPermission)
{ {
<PermissionManagementModal @ref="PermissionManagementModal"/> <PermissionManagementModal @ref="PermissionManagementModal" />
} }
Write Preview
Loading…
Cancel
Save