From 74b7215fed4a1cd675b9b8056d29ed752bcfb689 Mon Sep 17 00:00:00 2001
From: Matt Lewellyn <guruofgentoo@gmail.com>
Date: Wed, 7 Dec 2022 13:54:28 -0500
Subject: [PATCH] resolve radio ID duplication and error display in Bootstrap 4
 refs #156

---
 .../templates/keg-elements/forms/horizontal-b3.html         | 2 +-
 .../templates/keg-elements/forms/horizontal-b4.html         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/keg_elements/templates/keg-elements/forms/horizontal-b3.html b/keg_elements/templates/keg-elements/forms/horizontal-b3.html
index e3a2099..3484e70 100644
--- a/keg_elements/templates/keg-elements/forms/horizontal-b3.html
+++ b/keg_elements/templates/keg-elements/forms/horizontal-b3.html
@@ -160,7 +160,7 @@
                 <label>
                     <input type="radio"
                            name="{{ field.id }}"
-                           id="{{ field.id }}"
+                           id="{{ field.id }}-{{ value | lower }}"
                            value="{{ value }}"
                            {{ 'checked' if checked }}
                            {{ 'disabled' if field.flags.disabled or (field.flags.readonly and not checked) }}
diff --git a/keg_elements/templates/keg-elements/forms/horizontal-b4.html b/keg_elements/templates/keg-elements/forms/horizontal-b4.html
index 76dbe95..73cb298 100644
--- a/keg_elements/templates/keg-elements/forms/horizontal-b4.html
+++ b/keg_elements/templates/keg-elements/forms/horizontal-b4.html
@@ -182,9 +182,9 @@
         {% for value, label, checked in field.iter_choices() %}
             <div class="radio form-check">
                 <input type="radio"
-                    class=""form-check-input"
+                    class="form-check-input{{' is-invalid' if field.errors }}"
                     name="{{ field.id }}"
-                    id="{{ field.id }}"
+                    id="{{ field.id }}-{{ value | lower }}"
                     value="{{ value }}"
                     {{ 'checked' if checked }}
                     {{ 'disabled' if field.flags.disabled or (field.flags.readonly and not checked) }}
@@ -192,9 +192,9 @@
                 <label class="form-check-label">
                     {{ label }}
                 </label>
+                {% if loop.last %}{{ field_errors(field) }}{% endif %}
             </div>
         {% endfor %}
-        {{ field_errors(field) }}
         </div>
         {% if field.description %}
             {{ description(field) }}