From b29499d7991e112974c1307ee25146b63aa868af Mon Sep 17 00:00:00 2001
From: Jean-Philippe Laverdure <jp.laverdure@gmail.com>
Date: Tue, 9 Jan 2024 15:29:27 -0500
Subject: [PATCH 1/4] Update field.html to enable the use of custom-controls on
 checkbox inputs when show_form_labels is False (#1)

The current code prevents the display of checkboxes (single) as BS4 custom-controls if show_form_labels is False.
This modification moves the control of the label display around the label block itself allowing the display of checkboxes as custom-control regardless of the value of show_form_labels.
---
 crispy_bootstrap4/templates/bootstrap4/field.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/crispy_bootstrap4/templates/bootstrap4/field.html b/crispy_bootstrap4/templates/bootstrap4/field.html
index 76591bf..ff24c43 100644
--- a/crispy_bootstrap4/templates/bootstrap4/field.html
+++ b/crispy_bootstrap4/templates/bootstrap4/field.html
@@ -26,8 +26,8 @@
         {% endif %}
 
         {% if not field|is_checkboxselectmultiple and not field|is_radioselect %}
-            {% if field|is_checkbox and form_show_labels %}
-                {%if use_custom_control%}
+            {% if field|is_checkbox %}
+                {% if use_custom_control %}
                     {% if field.errors %}
                         {% crispy_field field 'class' 'custom-control-input is-invalid' %}
                     {% else %}
@@ -40,9 +40,11 @@
                         {% crispy_field field 'class' 'form-check-input' %}
                     {% endif %}
                 {% endif %}
+                {% if form_show_labels %}
                 <label for="{{ field.id_for_label }}" class="{%if use_custom_control%}custom-control-label{% else %}form-check-label{% endif %}{% if field.field.required %} requiredField{% endif %}">
                     {{ field.label }}{% if field.field.required %}<span class="asteriskField">*</span>{% endif %}
                 </label>
+                {% endif %}
                 {% include 'bootstrap4/layout/help_text_and_errors.html' %}
             {% elif field|is_file and use_custom_control  %}
                 {% include 'bootstrap4/layout/field_file.html' %}

From 470353bb0519b7083a9ad2f4a36d730ad232d9e5 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Laverdure <jp.laverdure@gmail.com>
Date: Wed, 10 Jan 2024 09:39:21 -0500
Subject: [PATCH 2/4] Update test_inline_formset_checkbox.html

---
 .../test_layout/test_inline_formset_checkbox.html         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/results/bootstrap4/test_layout/test_inline_formset_checkbox.html b/tests/results/bootstrap4/test_layout/test_inline_formset_checkbox.html
index 0c851d2..9990e6a 100644
--- a/tests/results/bootstrap4/test_layout/test_inline_formset_checkbox.html
+++ b/tests/results/bootstrap4/test_layout/test_inline_formset_checkbox.html
@@ -22,7 +22,7 @@
             <div class="form-group">
                 <td id="div_id_form-__prefix__-box_one" class="custom-checkbox">
                     <div>
-                        <input type="checkbox" name="form-__prefix__-box_one" class="checkboxinput form-control"
+                        <input type="checkbox" name="form-__prefix__-box_one" class="checkboxinput custom-control-input"
                                id="id_form-__prefix__-box_one">
                     </div>
                 </td>
@@ -30,7 +30,7 @@
             <div class="form-group">
                 <td id="div_id_form-__prefix__-box_two" class="custom-checkbox">
                     <div>
-                        <input type="checkbox" name="form-__prefix__-box_two" class="checkboxinput form-control"
+                        <input type="checkbox" name="form-__prefix__-box_two" class="checkboxinput custom-control-input"
                                id="id_form-__prefix__-box_two">
                     </div>
                 </td>
@@ -40,7 +40,7 @@
             <div class="form-group">
                 <td id="div_id_form-0-box_one" class="custom-checkbox">
                     <div>
-                        <input type="checkbox" name="form-0-box_one" class="checkboxinput form-control"
+                        <input type="checkbox" name="form-0-box_one" class="checkboxinput custom-control-input"
                                id="id_form-0-box_one">
                     </div>
                 </td>
@@ -48,7 +48,7 @@
             <div class="form-group">
                 <td id="div_id_form-0-box_two" class="custom-checkbox">
                     <div>
-                        <input type="checkbox" name="form-0-box_two" class="checkboxinput form-control"
+                        <input type="checkbox" name="form-0-box_two" class="checkboxinput custom-control-input"
                                id="id_form-0-box_two">
                     </div>
                 </td>

From 50a84a226744fd336dc6eeb59f7e0dc1c86934f8 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Laverdure <jp.laverdure@gmail.com>
Date: Wed, 17 Jan 2024 11:26:54 -0500
Subject: [PATCH 3/4] Update test_inline_formset_checkbox.html

Removes extraneous <div> tags from testing template
---
 .../test_inline_formset_checkbox.html            | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/tests/results/bootstrap4/test_layout/test_inline_formset_checkbox.html b/tests/results/bootstrap4/test_layout/test_inline_formset_checkbox.html
index 9990e6a..0f4f1c8 100644
--- a/tests/results/bootstrap4/test_layout/test_inline_formset_checkbox.html
+++ b/tests/results/bootstrap4/test_layout/test_inline_formset_checkbox.html
@@ -21,36 +21,28 @@
         <tr class="d-none empty-form">
             <div class="form-group">
                 <td id="div_id_form-__prefix__-box_one" class="custom-checkbox">
-                    <div>
-                        <input type="checkbox" name="form-__prefix__-box_one" class="checkboxinput custom-control-input"
+                    <input type="checkbox" name="form-__prefix__-box_one" class="checkboxinput custom-control-input"
                                id="id_form-__prefix__-box_one">
-                    </div>
                 </td>
             </div>
             <div class="form-group">
                 <td id="div_id_form-__prefix__-box_two" class="custom-checkbox">
-                    <div>
-                        <input type="checkbox" name="form-__prefix__-box_two" class="checkboxinput custom-control-input"
+                    <input type="checkbox" name="form-__prefix__-box_two" class="checkboxinput custom-control-input"
                                id="id_form-__prefix__-box_two">
-                    </div>
                 </td>
             </div>
         </tr>
         <tr>
             <div class="form-group">
                 <td id="div_id_form-0-box_one" class="custom-checkbox">
-                    <div>
-                        <input type="checkbox" name="form-0-box_one" class="checkboxinput custom-control-input"
+                    <input type="checkbox" name="form-0-box_one" class="checkboxinput custom-control-input"
                                id="id_form-0-box_one">
-                    </div>
                 </td>
             </div>
             <div class="form-group">
                 <td id="div_id_form-0-box_two" class="custom-checkbox">
-                    <div>
-                        <input type="checkbox" name="form-0-box_two" class="checkboxinput custom-control-input"
+                    <input type="checkbox" name="form-0-box_two" class="checkboxinput custom-control-input"
                                id="id_form-0-box_two">
-                    </div>
                 </td>
             </div>
         </tr>

From 025ccf32e4768d0821764930078dc8eb447c064b Mon Sep 17 00:00:00 2001
From: jplaverdure <jean-philippe.laverdure@umontreal.ca>
Date: Mon, 5 Feb 2024 10:37:18 -0500
Subject: [PATCH 4/4] Fixes display issue tied with absence of <label> when
 using custom-checkbox

---
 .../templates/bootstrap4/field.html           | 21 ++++++++++----
 .../test_inline_formset_checkbox.html         | 28 +++++++++++++------
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/crispy_bootstrap4/templates/bootstrap4/field.html b/crispy_bootstrap4/templates/bootstrap4/field.html
index ff24c43..56fe326 100644
--- a/crispy_bootstrap4/templates/bootstrap4/field.html
+++ b/crispy_bootstrap4/templates/bootstrap4/field.html
@@ -11,7 +11,7 @@
     {% endif %}
     <{% if tag %}{{ tag }}{% else %}div{% endif %} id="div_{{ field.auto_id }}" class="{% if not field|is_checkbox %}form-group{% if 'form-horizontal' in form_class %} row{% endif %}{% else %}{%if use_custom_control%}{% if tag != 'td' %}custom-control {%endif%} custom-checkbox{% else %}form-check{% endif %}{% endif %}{% if wrapper_class %} {{ wrapper_class }}{% endif %}{% if field.css_classes %} {{ field.css_classes }}{% endif %}">
         {% if field.label and not field|is_checkbox and form_show_labels %}
-        {# not field|is_radioselect in row below can be removed once Django 3.2 is no longer supported #}    
+        {# not field|is_radioselect in row below can be removed once Django 3.2 is no longer supported #}
         <label {% if field.id_for_label and not field|is_radioselect %}for="{{ field.id_for_label }}" {% endif %}class="{% if 'form-horizontal' in form_class %}col-form-label {% endif %}{{ label_class }}{% if field.field.required %} requiredField{% endif %}">
                 {{ field.label }}{% if field.field.required %}<span class="asteriskField">*</span>{% endif %}
             </label>
@@ -28,6 +28,10 @@
         {% if not field|is_checkboxselectmultiple and not field|is_radioselect %}
             {% if field|is_checkbox %}
                 {% if use_custom_control %}
+                    {% if tag == 'td' %}
+                        <div class="custom-control custom-checkbox">
+                    {% endif %}
+
                     {% if field.errors %}
                         {% crispy_field field 'class' 'custom-control-input is-invalid' %}
                     {% else %}
@@ -40,12 +44,17 @@
                         {% crispy_field field 'class' 'form-check-input' %}
                     {% endif %}
                 {% endif %}
-                {% if form_show_labels %}
                 <label for="{{ field.id_for_label }}" class="{%if use_custom_control%}custom-control-label{% else %}form-check-label{% endif %}{% if field.field.required %} requiredField{% endif %}">
-                    {{ field.label }}{% if field.field.required %}<span class="asteriskField">*</span>{% endif %}
+                    {% if form_show_labels %}
+                        {{ field.label }}{% if field.field.required %}<span class="asteriskField">*</span>{% endif %}
+                    {% else %}
+                        &nbsp;
+                    {% endif %}
                 </label>
-                {% endif %}
                 {% include 'bootstrap4/layout/help_text_and_errors.html' %}
+                {% if use_custom_control and tag == 'td' %}
+                    </div>
+                {% endif %}
             {% elif field|is_file and use_custom_control  %}
                 {% include 'bootstrap4/layout/field_file.html' %}
             {% else %}
@@ -57,13 +66,13 @@
                             {% crispy_field field 'class' 'custom-select' %}
                         {% endif %}
                     {% elif field|is_file %}
-                        {% if field.errors %}                 
+                        {% if field.errors %}
                             {% crispy_field field 'class' 'form-control-file is-invalid' %}
                         {% else %}
                             {% crispy_field field 'class' 'form-control-file' %}
                         {% endif %}
                     {% else %}
-                        {% if field.errors %}                      
+                        {% if field.errors %}
                             {% crispy_field field 'class' 'form-control is-invalid' %}
                         {% else %}
                             {% crispy_field field 'class' 'form-control' %}
diff --git a/tests/results/bootstrap4/test_layout/test_inline_formset_checkbox.html b/tests/results/bootstrap4/test_layout/test_inline_formset_checkbox.html
index 0f4f1c8..4df52f7 100644
--- a/tests/results/bootstrap4/test_layout/test_inline_formset_checkbox.html
+++ b/tests/results/bootstrap4/test_layout/test_inline_formset_checkbox.html
@@ -21,28 +21,40 @@
         <tr class="d-none empty-form">
             <div class="form-group">
                 <td id="div_id_form-__prefix__-box_one" class="custom-checkbox">
-                    <input type="checkbox" name="form-__prefix__-box_one" class="checkboxinput custom-control-input"
-                               id="id_form-__prefix__-box_one">
+                    <div class="custom-control custom-checkbox">
+                        <input type="checkbox" name="form-__prefix__-box_one" class="checkboxinput custom-control-input"
+                                id="id_form-__prefix__-box_one">
+                        <label for="id_form-__prefix__-box_one" class="custom-control-label requiredField">&nbsp;</label>
+                    </div>
                 </td>
             </div>
             <div class="form-group">
                 <td id="div_id_form-__prefix__-box_two" class="custom-checkbox">
-                    <input type="checkbox" name="form-__prefix__-box_two" class="checkboxinput custom-control-input"
-                               id="id_form-__prefix__-box_two">
+                    <div class="custom-control custom-checkbox">
+                        <input type="checkbox" name="form-__prefix__-box_two" class="checkboxinput custom-control-input"
+                                id="id_form-__prefix__-box_two">
+                        <label for="id_form-__prefix__-box_two" class="custom-control-label requiredField">&nbsp;</label>
+                    </div>
                 </td>
             </div>
         </tr>
         <tr>
             <div class="form-group">
                 <td id="div_id_form-0-box_one" class="custom-checkbox">
-                    <input type="checkbox" name="form-0-box_one" class="checkboxinput custom-control-input"
-                               id="id_form-0-box_one">
+                    <div class="custom-control custom-checkbox">
+                        <input type="checkbox" name="form-0-box_one" class="checkboxinput custom-control-input"
+                                id="id_form-0-box_one">
+                        <label for="id_form-0-box_one" class="custom-control-label requiredField">&nbsp;</label>
+                    </div>
                 </td>
             </div>
             <div class="form-group">
                 <td id="div_id_form-0-box_two" class="custom-checkbox">
-                    <input type="checkbox" name="form-0-box_two" class="checkboxinput custom-control-input"
-                               id="id_form-0-box_two">
+                    <div class="custom-control custom-checkbox">
+                        <input type="checkbox" name="form-0-box_two" class="checkboxinput custom-control-input"
+                                id="id_form-0-box_two">
+                        <label for="id_form-0-box_two" class="custom-control-label requiredField">&nbsp;</label>
+                    </div>
                 </td>
             </div>
         </tr>