From 7bd51048aa309ae3fadbef1128c68a020c8a95b6 Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Tue, 22 Dec 2020 20:36:54 +0800
Subject: [PATCH] Use AbpIdNameTagHelper

---
 .../Pages/Consent.cshtml                                  | 8 ++++----
 .../Pages/Identity/Users/CreateModal.cshtml               | 4 ++--
 .../Pages/Identity/Users/EditModal.cshtml                 | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Consent.cshtml b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Consent.cshtml
index 02b4f75416..47459bc81b 100644
--- a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Consent.cshtml
+++ b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Consent.cshtml
@@ -36,7 +36,7 @@
                         <li class="list-group-item">
                             <div class="form-check">
                                 <label asp-for="@identityScope.Checked" for="ConsentInput_IdentityScopes_@(i)__Checked" class="form-check-label">
-                                    <input name="ConsentInput.IdentityScopes[@i].Checked" id="ConsentInput_IdentityScopes_@(i)__Checked" asp-for="@identityScope.Checked" class="form-check-input"  />
+                                    <input abp-id-name="@Model.ConsentInput.IdentityScopes[i].Checked" asp-for="@identityScope.Checked" class="form-check-input"  />
                                     @identityScope.DisplayName
                                     @if (identityScope.Required)
                                     {
@@ -44,7 +44,7 @@
                                     }
                                 </label>
                             </div>
-                            <input name="ConsentInput.IdentityScopes[@i].Name" id="ConsentInput_IdentityScopes_@(i)Name" asp-for="@identityScope.Name" type="hidden" /> @* TODO: Use attributes on the view model instead of using hidden here *@
+                            <input abp-id-name="@Model.ConsentInput.IdentityScopes[i].Name" asp-for="@identityScope.Name" type="hidden" /> @* TODO: Use attributes on the view model instead of using hidden here *@
                             @if (identityScope.Description != null)
                             {
                                 <div class="consent-description">
@@ -67,7 +67,7 @@
                         <li class="list-group-item">
                             <div class="form-check">
                                 <label asp-for="@apiScope.Checked" for="ConsentInput_ApiScopes_@(i)__Checked" class="form-check-label">
-                                    <input name="ConsentInput.ApiScopes[@i].Checked" id="ConsentInput_ApiScopes_@(i)__Checked" asp-for="@apiScope.Checked" class="form-check-input" disabled="@apiScope.Required" />
+                                    <input abp-id-name="@Model.ConsentInput.ApiScopes[i].Checked" asp-for="@apiScope.Checked" class="form-check-input" disabled="@apiScope.Required" />
                                     @apiScope.DisplayName
                                     @if (apiScope.Required)
                                     {
@@ -75,7 +75,7 @@
                                     }
                                 </label>
                             </div>
-                            <input name="ConsentInput.ApiScopes[@i].Name" id="ConsentInput_ApiScopes_@(i)Name" asp-for="@apiScope.Name" type="hidden" /> @* TODO: Use attributes on the view model instead of using hidden here *@
+                            <input abp-id-name="@Model.ConsentInput.ApiScopes[i].Name" asp-for="@apiScope.Name" type="hidden" /> @* TODO: Use attributes on the view model instead of using hidden here *@
                             @if (apiScope.Description != null)
                             {
                                 <div class="consent-description">
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml
index 868d749e3b..3fbe633cd4 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml
@@ -60,8 +60,8 @@
                     @for (var i = 0; i < Model.Roles.Length; i++)
                     {
                         var role = Model.Roles[i];
-                        <abp-input id="Role_@(i)__IsAssigned" name="Roles[@i].IsAssigned" asp-for="@role.IsAssigned" label="@role.Name" />
-                        <input name="Roles[@i].Name" asp-for="@role.Name" />
+                        <abp-input abp-id-name="@Model.Roles[i].IsAssigned" asp-for="@role.IsAssigned" label="@role.Name" />
+                        <input abp-id-name="@Model.Roles[i].Name" asp-for="@role.Name" />
                     }
                 </abp-tab>
             </abp-tabs>
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml
index ca290a33ed..d570a0f794 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml
@@ -61,8 +61,8 @@
                     @for (var i = 0; i < Model.Roles.Length; i++)
                     {
                         var role = Model.Roles[i];
-                        <abp-input id="Role_@(i)__IsAssigned" name="Roles[@i].IsAssigned" asp-for="@role.IsAssigned" label="@role.Name" />
-                        <input name="Roles[@i].Name" asp-for="@role.Name" />
+                        <abp-input abp-id-name="@Model.Roles[i].IsAssigned" asp-for="@role.IsAssigned" label="@role.Name" />
+                        <input abp-id-name="@Model.Roles[i].Name" asp-for="@role.Name" />
                     }
                 </abp-tab>
             </abp-tabs>