From dd3be5230d12c16ba876adc40ebb6f21466f8706 Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 3 Sep 2021 11:18:04 +0800 Subject: [PATCH 1/3] Add ProviderKeyDisplayName to permissions modal. Resolve #9962 --- .../Pages/FeatureManagement/FeatureManagementModal.cshtml.cs | 3 +++ .../src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js | 1 + .../src/Volo.Abp.Identity.Web/Pages/Identity/Users/index.js | 1 + .../PermissionManagementModal.cshtml.cs | 5 ++++- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml.cs index 9598c9a46a..33df374c50 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml.cs @@ -22,6 +22,9 @@ namespace Volo.Abp.FeatureManagement.Web.Pages.FeatureManagement [BindProperty(SupportsGet = true)] public string ProviderKey { get; set; } + [BindProperty(SupportsGet = true)] + public string ProviderKeyDisplayName { get; set; } + [BindProperty] public List FeatureGroups { get; set; } 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 index e25bc64354..364b922d08 100644 --- 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 index 71675d8b8e..833d29f6db 100644 --- 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/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs index a990437464..cdf374ecfc 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs @@ -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 Groups { get; set; } @@ -51,7 +54,7 @@ namespace Volo.Abp.PermissionManagement.Web.Pages.AbpPermissionManagement var result = await PermissionAppService.GetAsync(ProviderName, ProviderKey); - EntityDisplayName = result.EntityDisplayName; + EntityDisplayName = ProviderKeyDisplayName ?? result.EntityDisplayName; Groups = ObjectMapper .Map, List>(result.Groups) From c14c7825c484f17ce16cf0b83467b69d0e8824c8 Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 3 Sep 2021 11:19:29 +0800 Subject: [PATCH 2/3] Update FeatureManagementModal.cshtml.cs --- .../Pages/FeatureManagement/FeatureManagementModal.cshtml.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml.cs index 33df374c50..9598c9a46a 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml.cs @@ -22,9 +22,6 @@ namespace Volo.Abp.FeatureManagement.Web.Pages.FeatureManagement [BindProperty(SupportsGet = true)] public string ProviderKey { get; set; } - [BindProperty(SupportsGet = true)] - public string ProviderKeyDisplayName { get; set; } - [BindProperty] public List FeatureGroups { get; set; } From 7ce602765b5201139594aa47c03df0b5b7cc01f8 Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 3 Sep 2021 11:26:28 +0800 Subject: [PATCH 3/3] Update PermissionManagementModal.cshtml.cs --- .../PermissionManagementModal.cshtml.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs index cdf374ecfc..d3232b54dd 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs @@ -54,7 +54,9 @@ namespace Volo.Abp.PermissionManagement.Web.Pages.AbpPermissionManagement var result = await PermissionAppService.GetAsync(ProviderName, ProviderKey); - EntityDisplayName = ProviderKeyDisplayName ?? result.EntityDisplayName; + EntityDisplayName = !string.IsNullOrWhiteSpace(ProviderKeyDisplayName) + ? ProviderKeyDisplayName + : result.EntityDisplayName; Groups = ObjectMapper .Map, List>(result.Groups)