From 1ec5e60a1c7daf5d2495a982d758c02a249ab6a5 Mon Sep 17 00:00:00 2001
From: Ahmet <ahmet.cotur@hotmail.com>
Date: Thu, 5 Nov 2020 10:12:01 +0300
Subject: [PATCH] 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 @@
                 <EntityActions TItem="IdentityRoleDto" EntityActionsColumn="@EntityActionsColumn">
                     <EntityAction TItem="IdentityRoleDto"
                                   RequiredPolicy="@UpdatePolicyName"
-                                  Clicked="() => OpenEditModalAsync(context.Id)"
+                                  Clicked="() => OpenEditModalAsync(context)"
                                   Text="@L["Edit"]"></EntityAction>
                     <EntityAction TItem="IdentityRoleDto"
                                   RequiredPolicy="@ManagePermissionsPolicyName"
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
index 6f26d28a8b..96dd3dad13 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
@@ -36,7 +36,7 @@
                 <EntityActions TItem="IdentityUserDto" EntityActionsColumn="@EntityActionsColumn">
                     <EntityAction TItem="IdentityUserDto"
                                   RequiredPolicy="@UpdatePolicyName"
-                                  Clicked="() => OpenEditModalAsync(context.Id)"
+                                  Clicked="() => OpenEditModalAsync(context)"
                                   Text="@L["Edit"]" />
                     <EntityAction TItem="IdentityUserDto"
                                   RequiredPolicy="@ManagePermissionsPolicyName"
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs
index 428376d9ef..de852fe8eb 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs
@@ -69,11 +69,11 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
             return base.OnCreatingEntityAsync();
         }
 
-        protected async override Task OpenEditModalAsync(Guid id)
+        protected async override Task OpenEditModalAsync(IdentityUserDto entity)
         {
             EditModalSelectedTab = DefaultSelectedTab;
 
-            var userRoleNames = (await AppService.GetRolesAsync(id)).Items.Select(r => 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()