Browse Source

remove non-async methods.

pull/5399/head
Halil İbrahim Kalkan 5 years ago
parent
commit
064a5d1dd1
  1. 16
      framework/src/Volo.Abp.BlazoriseUI/Volo/Abp/BlazoriseUI/BlazoriseCrudPageBase.cs
  2. 10
      modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
  3. 14
      modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
  4. 5
      modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs

16
framework/src/Volo.Abp.BlazoriseUI/Volo/Abp/BlazoriseUI/BlazoriseCrudPageBase.cs

@ -168,12 +168,6 @@ namespace Volo.Abp.BlazoriseUI
StateHasChanged();
}
protected virtual void OpenCreateModal()
{
NewEntity = new TCreateInput();
CreateModal.Show();
}
protected virtual Task OpenCreateModalAsync()
{
NewEntity = new TCreateInput();
@ -181,11 +175,6 @@ namespace Volo.Abp.BlazoriseUI
return Task.CompletedTask;
}
protected virtual void CloseCreateModal()
{
CreateModal.Hide();
}
protected virtual Task CloseCreateModalAsync()
{
CreateModal.Hide();
@ -202,11 +191,6 @@ namespace Volo.Abp.BlazoriseUI
EditModal.Show();
}
protected virtual void CloseEditModal()
{
EditModal.Hide();
}
protected virtual Task CloseEditModalAsync()
{
EditModal.Hide();

10
modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor

@ -15,7 +15,7 @@
</Column>
<Column ColumnSize="ColumnSize.Is6">
<Paragraph Alignment="TextAlignment.Right">
<Button Color="Color.Primary" Clicked="OpenCreateModal">@L["NewRole"]</Button>
<Button Color="Color.Primary" Clicked="OpenCreateModalAsync">@L["NewRole"]</Button>
</Paragraph>
</Column>
</Row>
@ -65,7 +65,7 @@
<ModalContent IsCentered="true">
<ModalHeader>
<ModalTitle>@L["NewRole"]</ModalTitle>
<CloseButton Clicked="CloseCreateModal" />
<CloseButton Clicked="CloseCreateModalAsync" />
</ModalHeader>
<ModalBody>
<Field>
@ -78,7 +78,7 @@
</Field>
</ModalBody>
<ModalFooter>
<Button Color="Color.Secondary" Clicked="CloseCreateModal">@L["Cancel"]</Button>
<Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
<Button Color="Color.Primary" Clicked="CreateEntityAsync">@L["Save"]</Button>
</ModalFooter>
</ModalContent>
@ -90,7 +90,7 @@
<ModalContent IsCentered="true">
<ModalHeader>
<ModalTitle>Edit role</ModalTitle>
<CloseButton Clicked="CloseEditModal" />
<CloseButton Clicked="CloseEditModalAsync" />
</ModalHeader>
<ModalBody>
<input type="hidden" name="ConcurrencyStamp" @bind-value="EditingEntity.ConcurrencyStamp" />
@ -104,7 +104,7 @@
</Field>
</ModalBody>
<ModalFooter>
<Button Color="Color.Secondary" Clicked="CloseEditModal">@L["Cancel"]</Button>
<Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
<Button Color="Color.Primary" Clicked="UpdateEntityAsync">@L["Save"]</Button>
</ModalFooter>
</ModalContent>

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

@ -15,7 +15,7 @@
</Column>
<Column ColumnSize="ColumnSize.Is6">
<Paragraph Alignment="TextAlignment.Right">
<Button Color="Color.Primary" Clicked="OpenCreateModal">@L["NewUser"]</Button>
<Button Color="Color.Primary" Clicked="OpenCreateModalAsync">@L["NewUser"]</Button>
</Paragraph>
</Column>
</Row>
@ -67,7 +67,7 @@
<ModalContent IsCentered="true">
<ModalHeader>
<ModalTitle>@L["NewUser"]</ModalTitle>
<CloseButton Clicked="CloseCreateModal" />
<CloseButton Clicked="CloseCreateModalAsync" />
</ModalHeader>
<ModalBody>
<Tabs SelectedTab="UserInformations">
@ -124,7 +124,7 @@
</Tabs>
</ModalBody>
<ModalFooter>
<Button Color="Color.Secondary" Clicked="CloseCreateModal">@L["Cancel"]</Button>
<Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
<Button Color="Color.Primary" Clicked="CreateEntityAsync">@L["Save"]</Button>
</ModalFooter>
</ModalContent>
@ -136,11 +136,11 @@
<ModalContent IsCentered="true">
<ModalHeader>
<ModalTitle>role</ModalTitle>
<CloseButton Clicked="CloseEditModal" />
<CloseButton Clicked="CloseEditModalAsync" />
</ModalHeader>
<ModalBody>
<input type="hidden" name="ConcurrencyStamp" @bind-value="EditingEntity.ConcurrencyStamp" />
<Tabs SelectedTab="UserInformations">
<Items>
<Tab Name="UserInformations">@L["UserInformations"]</Tab>
@ -195,10 +195,10 @@
</Tabs>
</ModalBody>
<ModalFooter>
<Button Color="Color.Secondary" Clicked="CloseEditModal">@L["Cancel"]</Button>
<Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
<Button Color="Color.Primary" Clicked="UpdateEntityAsync">@L["Save"]</Button>
</ModalFooter>
</ModalContent>
</Modal>
<PermissionManagementModal @ref="PermissionManagementModal"/>
<PermissionManagementModal @ref="PermissionManagementModal"/>

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

@ -32,16 +32,15 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
Roles = (await AppService.GetAssignableRolesAsync()).Items;
}
protected override void OpenCreateModal()
protected override Task OpenCreateModalAsync()
{
NewUserRoles = Roles.Select(x => new AssignedRoleViewModel
{
Name = x.Name,
IsAssigned = x.IsDefault
}).ToArray();
base.OpenCreateModal();
return base.OpenCreateModalAsync();
}
protected override Task CreateEntityAsync()

Loading…
Cancel
Save