Browse Source
Merge pull request #9963 from abpframework/maliming/ProviderKeyDisplayName
Add ProviderKeyDisplayName to permissions modal.
pull/9965/head
liangshiwei
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
8 additions and
1 deletions
-
modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js
-
modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/index.js
-
modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs
|
|
|
@ -38,6 +38,7 @@ |
|
|
|
_permissionsModal.open({ |
|
|
|
providerName: 'R', |
|
|
|
providerKey: data.record.name, |
|
|
|
providerKeyDisplayName: data.record.name |
|
|
|
}); |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
@ -38,6 +38,7 @@ |
|
|
|
_permissionsModal.open({ |
|
|
|
providerName: 'U', |
|
|
|
providerKey: data.record.id, |
|
|
|
providerKeyDisplayName: data.record.userName |
|
|
|
}); |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
@ -22,6 +22,9 @@ namespace Volo.Abp.PermissionManagement.Web.Pages.AbpPermissionManagement |
|
|
|
[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 @@ namespace Volo.Abp.PermissionManagement.Web.Pages.AbpPermissionManagement |
|
|
|
|
|
|
|
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) |
|
|
|
|