Merge pull request #15067 from abpframework/auto-merge/rel-6-0/1574

Merge branch rel-7.0 with rel-6.0
pull/15068/head
Engincan VESKE 3 years ago committed by GitHub
commit 0c380af18f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1115,8 +1115,8 @@ namespace Acme.BookStore.Blazor.Pages
private async Task OnDataGridReadAsync(DataGridReadDataEventArgs<AuthorDto> e)
{
CurrentSorting = e.Columns
.Where(c => c.Direction != SortDirection.None)
.Select(c => c.Field + (c.Direction == SortDirection.Descending ? " DESC" : ""))
.Where(c => c.SortDirection != SortDirection.Default)
.Select(c => c.Field + (c.SortDirection == SortDirection.Descending ? " DESC" : ""))
.JoinAsString(",");
CurrentPage = e.Page - 1;
@ -1166,7 +1166,7 @@ namespace Acme.BookStore.Blazor.Pages
private async Task CreateAuthorAsync()
{
if (CreateValidationsRef.ValidateAll())
if (await CreateValidationsRef.ValidateAll())
{
await AuthorAppService.CreateAsync(NewAuthor);
await GetAuthorsAsync();
@ -1176,7 +1176,7 @@ namespace Acme.BookStore.Blazor.Pages
private async Task UpdateAuthorAsync()
{
if (EditValidationsRef.ValidateAll())
if (await EditValidationsRef.ValidateAll())
{
await AuthorAppService.UpdateAsync(EditingAuthorId, EditingAuthor);
await GetAuthorsAsync();

Loading…
Cancel
Save