From 4c9c6bc586aeb4f670ed6bf768c3139607d59efe Mon Sep 17 00:00:00 2001 From: Ahmet Date: Thu, 5 Nov 2020 10:11:45 +0300 Subject: [PATCH 1/5] replace input parameter for OpenEditModal --- framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs b/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs index 57337f0155..30a5c8ad26 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs +++ b/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs @@ -300,15 +300,15 @@ namespace Volo.Abp.BlazoriseUI return Task.CompletedTask; } - protected virtual async Task OpenEditModalAsync(TKey id) + protected virtual async Task OpenEditModalAsync(TListViewModel entity) { EditValidationsRef?.ClearAll(); await CheckUpdatePolicyAsync(); - var entityDto = await AppService.GetAsync(id); + var entityDto = await AppService.GetAsync(entity.Id); - EditingEntityId = id; + EditingEntityId = entity.Id; EditingEntity = MapToEditingEntity(entityDto); await InvokeAsync(() => StateHasChanged()); From 1ec5e60a1c7daf5d2495a982d758c02a249ab6a5 Mon Sep 17 00:00:00 2001 From: Ahmet Date: Thu, 5 Nov 2020 10:12:01 +0300 Subject: [PATCH 2/5] Fix datagrid for identity module --- .../Pages/Identity/RoleManagement.razor | 2 +- .../Pages/Identity/UserManagement.razor | 2 +- .../Pages/Identity/UserManagement.razor.cs | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor index 410ccc2cae..0cd4b6b4d2 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor +++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor @@ -37,7 +37,7 @@ r.Name).ToList(); + var userRoleNames = (await AppService.GetRolesAsync(entity.Id)).Items.Select(r => r.Name).ToList(); EditUserRoles = Roles.Select(x => new AssignedRoleViewModel { @@ -81,7 +81,7 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity IsAssigned = userRoleNames.Contains(x.Name) }).ToArray(); - await base.OpenEditModalAsync(id); + await base.OpenEditModalAsync(entity); } protected override Task OnUpdatingEntityAsync() From 5931f4a11184e4360259d4f96426bbb8f55f37c2 Mon Sep 17 00:00:00 2001 From: Ahmet Date: Thu, 5 Nov 2020 10:14:35 +0300 Subject: [PATCH 3/5] Fix datagrid for tenant management module --- .../Pages/TenantManagement/TenantManagement.razor | 4 ++-- .../Pages/TenantManagement/TenantManagement.razor.cs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor index 1d62dc6be0..1666274258 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor @@ -34,11 +34,11 @@ Date: Thu, 5 Nov 2020 11:01:22 +0300 Subject: [PATCH 4/5] Update Part-3.md --- docs/en/Tutorials/Part-3.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/en/Tutorials/Part-3.md b/docs/en/Tutorials/Part-3.md index dae7e4bfdb..2130352524 100644 --- a/docs/en/Tutorials/Part-3.md +++ b/docs/en/Tutorials/Part-3.md @@ -1264,7 +1264,7 @@ Open the `Books.razor` and add the following `DataGridColumn` section inside the @L["Actions"] - + @L["Edit"] @@ -1273,7 +1273,7 @@ Open the `Books.razor` and add the following `DataGridColumn` section inside the ```` -* `OpenEditModalAsync` is defined in the base class which takes the `Id` of the entity (book) to edit. +* `OpenEditModalAsync` is defined in the base class which takes the entity (book) to edit. This adds an "Actions" dropdown to all the books inside the `DataGrid` with an `Edit` action: @@ -1419,7 +1419,7 @@ Here the complete code to create the book management CRUD page, that has been de @L["Actions"] - + @L["Edit"] From 43d6c1796bcd6cccd65f76f4e72ea8db19b1b927 Mon Sep 17 00:00:00 2001 From: Ahmet Date: Thu, 5 Nov 2020 11:02:00 +0300 Subject: [PATCH 5/5] Update Part-5.md --- docs/en/Tutorials/Part-5.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/Tutorials/Part-5.md b/docs/en/Tutorials/Part-5.md index f07356e892..4243bfdad7 100644 --- a/docs/en/Tutorials/Part-5.md +++ b/docs/en/Tutorials/Part-5.md @@ -523,7 +523,7 @@ As similar to the *New Book* button, we can use `if` blocks to conditionally sho ````xml @if (canEditBook) { - + @L["Edit"] }