From 954245da107235c2993edd78f3901d6764e4108e Mon Sep 17 00:00:00 2001
From: Ahmet <ahmet.cotur@hotmail.com>
Date: Mon, 14 Dec 2020 14:23:20 +0300
Subject: [PATCH] closes: #6603

---
 .../Pages/Identity/RoleManagement.razor                       | 2 +-
 .../Pages/Identity/UserManagement.razor                       | 2 +-
 .../Components/PermissionManagementModal.razor.cs             | 4 ++--
 3 files changed, 4 insertions(+), 4 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 f20f4165e8..4a8eba02ca 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
@@ -45,7 +45,7 @@
                                           Text="@L["Edit"]"></EntityAction>
                             <EntityAction TItem="IdentityRoleDto"
                                           RequiredPolicy="@ManagePermissionsPolicyName"
-                                          Clicked="() => PermissionManagementModal.OpenAsync(PermissionProviderName, context.Name)"
+                                          Clicked="() => PermissionManagementModal.OpenAsync(PermissionProviderName, context.Name, context.Name)"
                                           Text="@L["Permissions"]"></EntityAction>
                             <EntityAction TItem="IdentityRoleDto"
                                           RequiredPolicy="@DeletePolicyName"
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 a371d4a646..676f05c147 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
@@ -44,7 +44,7 @@
                                           Text="@L["Edit"]" />
                             <EntityAction TItem="IdentityUserDto"
                                           RequiredPolicy="@ManagePermissionsPolicyName"
-                                          Clicked="() => PermissionManagementModal.OpenAsync(PermissionProviderName, context.Id.ToString())"
+                                          Clicked="() => PermissionManagementModal.OpenAsync(PermissionProviderName, context.Id.ToString(), context.Name)"
                                           Text="@L["Permissions"]" />
                             <EntityAction TItem="IdentityUserDto"
                                           RequiredPolicy="@DeletePolicyName"
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs
index 6f1e4c1a4e..45625a2852 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs
@@ -65,14 +65,14 @@ namespace Volo.Abp.PermissionManagement.Blazor.Components
             }
         }
         
-        public async Task OpenAsync(string providerName, string providerKey)
+        public async Task OpenAsync(string providerName, string providerKey, string entityDisplayName = null)
         {
             _providerName = providerName;
             _providerKey = providerKey;
 
             var result = await PermissionAppService.GetAsync(_providerName, _providerKey);
 
-            _entityDisplayName = result.EntityDisplayName;
+            _entityDisplayName = entityDisplayName ?? result.EntityDisplayName;
             _groups = result.Groups;
 
             _grantedPermissionCount = 0;