Merge pull request #9963 from abpframework/maliming/ProviderKeyDispla…

…yName Add ProviderKeyDisplayName to permissions modal.
abpframework · Sep 3, 2021 · f1f827f · f1f827f
2 parents d21544f + 7ce6027
commit f1f827f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js
@@ -38,6 +38,7 @@
                             _permissionsModal.open({
                                 providerName: 'R',
                                 providerKey: data.record.name,
+                                providerKeyDisplayName: data.record.name
                             });
                         },
                     },

diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/index.js b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/index.js
@@ -38,6 +38,7 @@
                             _permissionsModal.open({
                                 providerName: 'U',
                                 providerKey: data.record.id,
+                                providerKeyDisplayName: data.record.userName
                             });
                         },
                     },

diff --git a/...ermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs b/...ermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs
@@ -22,6 +22,9 @@ public class PermissionManagementModal : AbpPageModel
         [BindProperty(SupportsGet = true)]
         public string ProviderKey { get; set; }
 
+        [BindProperty(SupportsGet = true)]
+        public string ProviderKeyDisplayName { get; set; }
+
         [BindProperty]
         public List<PermissionGroupViewModel> Groups { get; set; }
 
@@ -51,7 +54,9 @@ public virtual async Task<IActionResult> OnGetAsync()
 
             var result = await PermissionAppService.GetAsync(ProviderName, ProviderKey);
 
-            EntityDisplayName = result.EntityDisplayName;
+            EntityDisplayName = !string.IsNullOrWhiteSpace(ProviderKeyDisplayName)
+                ? ProviderKeyDisplayName
+                : result.EntityDisplayName;
 
             Groups = ObjectMapper
                 .Map<List<PermissionGroupDto>, List<PermissionGroupViewModel>>(result.Groups)