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

Closes: #6256

pull/6352/head
Ahmet 6 years ago
parent
97c6a5f372
commit
e84eea8b3f
3 changed files with 182 additions and 158 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. 112
      modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
  2. 120
      modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
  3. 108
      modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor

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

@ -9,61 +9,69 @@
@inject AbpBlazorMessageLocalizerHelper<IdentityResource> LH @inject AbpBlazorMessageLocalizerHelper<IdentityResource> LH
@inherits AbpCrudPageBase<IIdentityRoleAppService, IdentityRoleDto, Guid, GetIdentityRolesInput, IdentityRoleCreateDto, IdentityRoleUpdateDto> @inherits AbpCrudPageBase<IIdentityRoleAppService, IdentityRoleDto, Guid, GetIdentityRolesInput, IdentityRoleCreateDto, IdentityRoleUpdateDto>
@* ************************* PAGE HEADER ************************* *@
<Row Class="justify-content-between">
<Column ColumnSize="ColumnSize.IsAuto">
<Heading Size="HeadingSize.Is1">@L["Roles"]</Heading>
</Column>
<Column ColumnSize="ColumnSize.IsAuto">
@if ( HasCreatePermission )
{
<Button Color="Color.Primary" Clicked="OpenCreateModalAsync">@L["NewRole"]</Button>
}
</Column>
</Row>
@* ************************* DATA GRID ************************* *@ <Card>
<DataGrid TItem="IdentityRoleDto" <CardHeader>
Data="Entities" @* ************************* PAGE HEADER ************************* *@
ReadData="OnDataGridReadAsync" <Row Class="justify-content-between">
TotalItems="TotalCount" <Column ColumnSize="ColumnSize.IsAuto">
ShowPager="true" <Heading Size="HeadingSize.Is1">@L["Roles"]</Heading>
PageSize="PageSize"> </Column>
<DataGridColumns> <Column ColumnSize="ColumnSize.IsAuto">
<DataGridEntityActionsColumn TItem="IdentityRoleDto" @ref="@EntityActionsColumn"> @if ( HasCreatePermission )
<DisplayTemplate>
<EntityActions TItem="IdentityRoleDto" EntityActionsColumn="@EntityActionsColumn">
<EntityAction TItem="IdentityRoleDto"
RequiredPolicy="@UpdatePolicyName"
Clicked="() => OpenEditModalAsync(context)"
Text="@L["Edit"]"></EntityAction>
<EntityAction TItem="IdentityRoleDto"
RequiredPolicy="@ManagePermissionsPolicyName"
Clicked="() => PermissionManagementModal.OpenAsync(PermissionProviderName, context.Name)"
Text="@L["Permissions"]"></EntityAction>
<EntityAction TItem="IdentityRoleDto"
RequiredPolicy="@DeletePolicyName"
Clicked="() => DeleteEntityAsync(context)"
ConfirmationMessage="()=> GetDeleteConfirmationMessage(context)"
Text="@L["Delete"]"></EntityAction>
</EntityActions>
</DisplayTemplate>
</DataGridEntityActionsColumn>
<DataGridColumn TItem="IdentityRoleDto" Field="@nameof(IdentityRoleDto.Name)" Caption="@L["RoleName"].Value">
<DisplayTemplate>
@(context.Name)
@if (context.IsDefault)
{ {
<Badge Color="Color.Primary" Margin="Margin.Is1.FromLeft">@L["DisplayName:IsDefault"]</Badge> <Button Color="Color.Primary" Clicked="OpenCreateModalAsync">
<Icon Margin="Margin.Is1.FromRight" Name="IconName.Add"></Icon>@L["NewRole"]
</Button>
} }
@if (context.IsPublic) </Column>
{ </Row>
<Badge Color="Color.Light" Margin="Margin.Is1.FromLeft">@L["DisplayName:IsPublic"]</Badge> </CardHeader>
} <CardBody>
</DisplayTemplate> @* ************************* DATA GRID ************************* *@
</DataGridColumn> <DataGrid TItem="IdentityRoleDto"
</DataGridColumns> Data="Entities"
</DataGrid> ReadData="OnDataGridReadAsync"
TotalItems="TotalCount"
ShowPager="true"
PageSize="PageSize">
<DataGridColumns>
<DataGridEntityActionsColumn TItem="IdentityRoleDto" @ref="@EntityActionsColumn">
<DisplayTemplate>
<EntityActions TItem="IdentityRoleDto" EntityActionsColumn="@EntityActionsColumn">
<EntityAction TItem="IdentityRoleDto"
RequiredPolicy="@UpdatePolicyName"
Clicked="() => OpenEditModalAsync(context)"
Text="@L["Edit"]"></EntityAction>
<EntityAction TItem="IdentityRoleDto"
RequiredPolicy="@ManagePermissionsPolicyName"
Clicked="() => PermissionManagementModal.OpenAsync(PermissionProviderName, context.Name)"
Text="@L["Permissions"]"></EntityAction>
<EntityAction TItem="IdentityRoleDto"
RequiredPolicy="@DeletePolicyName"
Clicked="() => DeleteEntityAsync(context)"
ConfirmationMessage="()=> GetDeleteConfirmationMessage(context)"
Text="@L["Delete"]"></EntityAction>
</EntityActions>
</DisplayTemplate>
</DataGridEntityActionsColumn>
<DataGridColumn TItem="IdentityRoleDto" Field="@nameof(IdentityRoleDto.Name)" Caption="@L["RoleName"].Value">
<DisplayTemplate>
@(context.Name)
@if (context.IsDefault)
{
<Badge Color="Color.Primary" Margin="Margin.Is1.FromLeft">@L["DisplayName:IsDefault"]</Badge>
}
@if (context.IsPublic)
{
<Badge Color="Color.Light" Margin="Margin.Is1.FromLeft">@L["DisplayName:IsPublic"]</Badge>
}
</DisplayTemplate>
</DataGridColumn>
</DataGridColumns>
</DataGrid>
</CardBody>
</Card>
@* ************************* CREATE MODAL ************************* *@ @* ************************* CREATE MODAL ************************* *@
@if (HasCreatePermission) @if (HasCreatePermission)

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

@ -8,63 +8,71 @@
@inject AbpBlazorMessageLocalizerHelper<IdentityResource> LH @inject AbpBlazorMessageLocalizerHelper<IdentityResource> LH
@inherits AbpCrudPageBase<IIdentityUserAppService, IdentityUserDto, Guid, GetIdentityUsersInput, IdentityUserCreateDto, IdentityUserUpdateDto> @inherits AbpCrudPageBase<IIdentityUserAppService, IdentityUserDto, Guid, GetIdentityUsersInput, IdentityUserCreateDto, IdentityUserUpdateDto>
@* ************************* PAGE HEADER ************************* *@
<Row Class="justify-content-between">
<Column ColumnSize="ColumnSize.IsAuto">
<h1>@L["Users"]</h1>
</Column>
<Column ColumnSize="ColumnSize.IsAuto">
@if (HasCreatePermission)
{
<Button Color="Color.Primary" Clicked="OpenCreateModalAsync">@L["NewUser"]</Button>
}
</Column>
</Row>
@* ************************* DATA GRID ************************* *@ <Card>
<DataGrid TItem="IdentityUserDto" <CardHeader>
Data="Entities" @* ************************* PAGE HEADER ************************* *@
ReadData="OnDataGridReadAsync" <Row Class="justify-content-between">
TotalItems="TotalCount" <Column ColumnSize="ColumnSize.IsAuto">
ShowPager="true" <h1>@L["Users"]</h1>
PageSize="PageSize"> </Column>
<DataGridColumns> <Column ColumnSize="ColumnSize.IsAuto">
<DataGridEntityActionsColumn TItem="IdentityUserDto" @ref="@EntityActionsColumn"> @if (HasCreatePermission)
<DisplayTemplate> {
<EntityActions TItem="IdentityUserDto" EntityActionsColumn="@EntityActionsColumn"> <Button Color="Color.Primary" Clicked="OpenCreateModalAsync">
<EntityAction TItem="IdentityUserDto" <Icon Margin="Margin.Is1.FromRight" Name="IconName.Add"></Icon>@L["NewUser"]
RequiredPolicy="@UpdatePolicyName" </Button>
Clicked="() => OpenEditModalAsync(context)" }
Text="@L["Edit"]" /> </Column>
<EntityAction TItem="IdentityUserDto" </Row>
RequiredPolicy="@ManagePermissionsPolicyName" </CardHeader>
Clicked="() => PermissionManagementModal.OpenAsync(PermissionProviderName, context.Id.ToString())" <CardBody>
Text="@L["Permissions"]" /> @* ************************* DATA GRID ************************* *@
<EntityAction TItem="IdentityUserDto" <DataGrid TItem="IdentityUserDto"
RequiredPolicy="@DeletePolicyName" Data="Entities"
Clicked="() => DeleteEntityAsync(context)" ReadData="OnDataGridReadAsync"
ConfirmationMessage="()=>GetDeleteConfirmationMessage(context)" TotalItems="TotalCount"
Text="@L["Delete"]" /> ShowPager="true"
</EntityActions> PageSize="PageSize">
</DisplayTemplate> <DataGridColumns>
</DataGridEntityActionsColumn> <DataGridEntityActionsColumn TItem="IdentityUserDto" @ref="@EntityActionsColumn">
<DataGridColumn TItem="IdentityUserDto" Field="@nameof(IdentityUserDto.UserName)" Caption="@L["UserName"].Value"> <DisplayTemplate>
<DisplayTemplate> <EntityActions TItem="IdentityUserDto" EntityActionsColumn="@EntityActionsColumn">
@(context.As<IdentityUserDto>().UserName) <EntityAction TItem="IdentityUserDto"
</DisplayTemplate> RequiredPolicy="@UpdatePolicyName"
</DataGridColumn> Clicked="() => OpenEditModalAsync(context)"
<DataGridColumn TItem="IdentityUserDto" Field="@nameof(IdentityUserDto.Email)" Caption="@L["Email"].Value"> Text="@L["Edit"]" />
<DisplayTemplate> <EntityAction TItem="IdentityUserDto"
@(context.As<IdentityUserDto>().Email) RequiredPolicy="@ManagePermissionsPolicyName"
</DisplayTemplate> Clicked="() => PermissionManagementModal.OpenAsync(PermissionProviderName, context.Id.ToString())"
</DataGridColumn> Text="@L["Permissions"]" />
<DataGridColumn TItem="IdentityUserDto" Field="@nameof(IdentityUserDto.PhoneNumber)" Caption="@L["PhoneNumber"].Value"> <EntityAction TItem="IdentityUserDto"
<DisplayTemplate> RequiredPolicy="@DeletePolicyName"
@(context.As<IdentityUserDto>().PhoneNumber) Clicked="() => DeleteEntityAsync(context)"
</DisplayTemplate> ConfirmationMessage="()=>GetDeleteConfirmationMessage(context)"
</DataGridColumn> Text="@L["Delete"]" />
</DataGridColumns> </EntityActions>
</DataGrid> </DisplayTemplate>
</DataGridEntityActionsColumn>
<DataGridColumn TItem="IdentityUserDto" Field="@nameof(IdentityUserDto.UserName)" Caption="@L["UserName"].Value">
<DisplayTemplate>
@(context.As<IdentityUserDto>().UserName)
</DisplayTemplate>
</DataGridColumn>
<DataGridColumn TItem="IdentityUserDto" Field="@nameof(IdentityUserDto.Email)" Caption="@L["Email"].Value">
<DisplayTemplate>
@(context.As<IdentityUserDto>().Email)
</DisplayTemplate>
</DataGridColumn>
<DataGridColumn TItem="IdentityUserDto" Field="@nameof(IdentityUserDto.PhoneNumber)" Caption="@L["PhoneNumber"].Value">
<DisplayTemplate>
@(context.As<IdentityUserDto>().PhoneNumber)
</DisplayTemplate>
</DataGridColumn>
</DataGridColumns>
</DataGrid>
</CardBody>
</Card>
@* ************************* CREATE MODAL ************************* *@ @* ************************* CREATE MODAL ************************* *@
@if (HasCreatePermission) @if (HasCreatePermission)

108
modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor
View File

@ -6,57 +6,65 @@
@using Volo.Abp.TenantManagement.Localization @using Volo.Abp.TenantManagement.Localization
@inject AbpBlazorMessageLocalizerHelper<AbpTenantManagementResource> LH @inject AbpBlazorMessageLocalizerHelper<AbpTenantManagementResource> LH
@inherits AbpCrudPageBase<ITenantAppService, TenantDto, Guid, GetTenantsInput, TenantCreateDto, TenantUpdateDto> @inherits AbpCrudPageBase<ITenantAppService, TenantDto, Guid, GetTenantsInput, TenantCreateDto, TenantUpdateDto>
@* ************************* PAGE HEADER ************************* *@
<Row Class="justify-content-between">
<Column ColumnSize="ColumnSize.IsAuto">
<Heading Size="HeadingSize.Is1">@L["Tenants"]</Heading>
</Column>
<Column ColumnSize="ColumnSize.IsAuto">
@if (HasCreatePermission)
{
<Button Color="Color.Primary" Clicked="OpenCreateModalAsync">@L["NewTenant"]</Button>
}
</Column>
</Row>
@* ************************* DATA GRID ************************* *@ <Card>
<DataGrid TItem="TenantDto" <CardHeader>
Data="Entities" @* ************************* PAGE HEADER ************************* *@
ReadData="OnDataGridReadAsync" <Row Class="justify-content-between">
TotalItems="TotalCount" <Column ColumnSize="ColumnSize.IsAuto">
ShowPager="true" <Heading Size="HeadingSize.Is1">@L["Tenants"]</Heading>
PageSize="PageSize"> </Column>
<DataGridColumns> <Column ColumnSize="ColumnSize.IsAuto">
<DataGridEntityActionsColumn TItem="TenantDto" @ref="@EntityActionsColumn"> @if (HasCreatePermission)
<DisplayTemplate> {
<EntityActions TItem="TenantDto" EntityActionsColumn="@EntityActionsColumn"> <Button Color="Color.Primary" Clicked="OpenCreateModalAsync">
<EntityAction TItem="TenantDto" <Icon Margin="Margin.Is1.FromRight" Name="IconName.Add"></Icon>@L["NewTenant"]
RequiredPolicy="@UpdatePolicyName" </Button>
Clicked="() => OpenEditModalAsync(context)" }
Text="@L["Edit"]"></EntityAction> </Column>
<EntityAction TItem="TenantDto" </Row>
RequiredPolicy="@ManageConnectionStringsPolicyName" </CardHeader>
Clicked="() => OpenEditConnectionStringModalAsync(context)" <CardBody>
Text="@L["ConnectionStrings"]"></EntityAction> @* ************************* DATA GRID ************************* *@
<EntityAction TItem="TenantDto" <DataGrid TItem="TenantDto"
RequiredPolicy="@ManageFeaturesPolicyName" Data="Entities"
Clicked="() => FeatureManagementModal.OpenAsync(FeatureProviderName, context.Id.ToString())" ReadData="OnDataGridReadAsync"
Text="@L["Features"]"></EntityAction> TotalItems="TotalCount"
<EntityAction TItem="TenantDto" ShowPager="true"
RequiredPolicy="@DeletePolicyName" PageSize="PageSize">
Clicked="() => DeleteEntityAsync(context)" <DataGridColumns>
ConfirmationMessage="()=>GetDeleteConfirmationMessage(context)" <DataGridEntityActionsColumn TItem="TenantDto" @ref="@EntityActionsColumn">
Text="@L["Delete"]"></EntityAction> <DisplayTemplate>
</EntityActions> <EntityActions TItem="TenantDto" EntityActionsColumn="@EntityActionsColumn">
</DisplayTemplate> <EntityAction TItem="TenantDto"
</DataGridEntityActionsColumn> RequiredPolicy="@UpdatePolicyName"
<DataGridColumn TItem="TenantDto" Field="@nameof(TenantDto.Name)" Caption="@L["TenantName"].Value"> Clicked="() => OpenEditModalAsync(context)"
<DisplayTemplate> Text="@L["Edit"]"></EntityAction>
@(context.Name) <EntityAction TItem="TenantDto"
</DisplayTemplate> RequiredPolicy="@ManageConnectionStringsPolicyName"
</DataGridColumn> Clicked="() => OpenEditConnectionStringModalAsync(context)"
</DataGridColumns> Text="@L["ConnectionStrings"]"></EntityAction>
</DataGrid> <EntityAction TItem="TenantDto"
RequiredPolicy="@ManageFeaturesPolicyName"
Clicked="() => FeatureManagementModal.OpenAsync(FeatureProviderName, context.Id.ToString())"
Text="@L["Features"]"></EntityAction>
<EntityAction TItem="TenantDto"
RequiredPolicy="@DeletePolicyName"
Clicked="() => DeleteEntityAsync(context)"
ConfirmationMessage="()=>GetDeleteConfirmationMessage(context)"
Text="@L["Delete"]"></EntityAction>
</EntityActions>
</DisplayTemplate>
</DataGridEntityActionsColumn>
<DataGridColumn TItem="TenantDto" Field="@nameof(TenantDto.Name)" Caption="@L["TenantName"].Value">
<DisplayTemplate>
@(context.Name)
</DisplayTemplate>
</DataGridColumn>
</DataGridColumns>
</DataGrid>
</CardBody>
</Card>
@* ************************* CREATE MODAL ************************* *@ @* ************************* CREATE MODAL ************************* *@
@if (HasCreatePermission) @if (HasCreatePermission)

Write Preview
Loading…
Cancel
Save