Merge branch 'resource-based-auth' into resource-based-auth-blazor

modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/ResourcePermissionManagementModal.cshtml

@@ -18,7 +18,7 @@
 
     <form method="post" asp-page="/AbpPermissionManagement/ResourcePermissionManagementModal">
         <abp-modal size="ExtraLarge">
-            <abp-modal-header title="@(L["ResourcePermissions"].Value)"></abp-modal-header>
+            <abp-modal-header title="@(L["ResourcePermissions"].Value) - @Model.ResourceDisplayName"></abp-modal-header>
             <input asp-for="@Model.ResourceName" />
             <input asp-for="@Model.ResourceKey" />
             <abp-modal-body>

modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/ResourcePermissionManagementModal.cshtml.cs

@@ -18,6 +18,10 @@ public class ResourcePermissionManagementModal : AbpPageModel
     [BindProperty(SupportsGet = true)]
     public string ResourceKey { get; set; }
 
+    [HiddenInput]
+    [BindProperty(SupportsGet = true)]
+    public string ResourceDisplayName { get; set; }
+
     public bool HasAnyResourcePermission { get; set; }
     public bool HasAnyResourceProviderKeyLookupService { get; set; }