From d0bd8d0af060612ffb5a0f95b80e93461e92516d Mon Sep 17 00:00:00 2001
From: Hermes Sbicego <hermes.sbicego@laser-group.com>
Date: Fri, 8 Jul 2022 16:49:56 +0200
Subject: [PATCH] Create unique HTML element ids for boolean fields edited via
 radio buttons (#8598)

---
 .../Views/EditorTemplates/Fields/Boolean.Edit.cshtml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Boolean.Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Boolean.Edit.cshtml
index f2b8ca3fe..f0b1188b9 100644
--- a/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Boolean.Edit.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Boolean.Edit.cshtml
@@ -13,17 +13,17 @@
         case SelectionMode.Radiobutton:
             if (settings.Optional) {
                 <div>
-                    <input type="radio" name="@Html.FieldNameFor(m => m.Value)" id="radio-unknown" value="" @if(!Model.Value.HasValue) { <text>checked="checked"</text> } />
-                    <label for="radio-unknown" class="forcheckbox">@T.Encode(settings.NotSetLabel)</label>
+                    <input type="radio" name="@Html.FieldNameFor(m => m.Value)" id="@Html.FieldIdFor(m => m.Value)-radio-unknown" value="" @if(!Model.Value.HasValue) { <text>checked="checked"</text> } />
+                    <label for="@Html.FieldIdFor(m => m.Value)-radio-unknown" class="forcheckbox">@T.Encode(settings.NotSetLabel)</label>
                 </div>
             }
             <div>
-                <input type="radio" name="@Html.FieldNameFor(m => m.Value)" id="radio-true" value="true" @if (Model.Value.HasValue && Model.Value.Value) { <text>checked="checked"</text> } />
-                <label for="radio-true" class="forcheckbox">@T.Encode(settings.OnLabel)</label>
+                <input type="radio" name="@Html.FieldNameFor(m => m.Value)" id="@Html.FieldIdFor(m => m.Value)-radio-true" value="true" @if (Model.Value.HasValue && Model.Value.Value) { <text>checked="checked"</text> } />
+                <label for="@Html.FieldIdFor(m => m.Value)-radio-true" class="forcheckbox">@T.Encode(settings.OnLabel)</label>
             </div>
             <div>
-                <input type="radio" name="@Html.FieldNameFor(m => m.Value)" id="radio-false" value="false" @if (Model.Value.HasValue && !Model.Value.Value) { <text>checked="checked"</text> } />
-                <label for="radio-false" class="forcheckbox">@T.Encode(settings.OffLabel)</label>
+                <input type="radio" name="@Html.FieldNameFor(m => m.Value)" id="@Html.FieldIdFor(m => m.Value)-radio-false" value="false" @if (Model.Value.HasValue && !Model.Value.Value) { <text>checked="checked"</text> } />
+                <label for="@Html.FieldIdFor(m => m.Value)-radio-false" class="forcheckbox">@T.Encode(settings.OffLabel)</label>
             </div>
         break;
         case SelectionMode.Dropdown: