From 0530e0ca4ea7f0ba62e6be4d763e6c70f777b596 Mon Sep 17 00:00:00 2001
From: Otu Ekanem <io2@users.noreply.github.com>
Date: Fri, 19 Mar 2021 17:48:40 +0100
Subject: [PATCH 1/5] updated select name attribute to use field.html_name

When using any of the `formset_factory`s to generate multiple forms, the select fields lose their values if the form is returned with an error.

This happens because the template renders `field.name` instead of `field.html_name`.

`field.name` is the same for all forms, `field.html_name` is unique for each form instance
---
 crispy_tailwind/templates/tailwind/layout/select.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crispy_tailwind/templates/tailwind/layout/select.html b/crispy_tailwind/templates/tailwind/layout/select.html
index 3266993..ae784f5 100644
--- a/crispy_tailwind/templates/tailwind/layout/select.html
+++ b/crispy_tailwind/templates/tailwind/layout/select.html
@@ -2,7 +2,7 @@
 {% load l10n %}
 
 <div class="relative">
-<select class="{% if field.errors %}border border-red-500 {% endif %}bg-white focus:outline-none border border-gray-300 rounded-lg py-2 px-4 block w-full appearance-none leading-normal text-gray-700" name="{{ field.name }}" {{ field.field.widget.attrs|flatatt }}>
+<select class="{% if field.errors %}border border-red-500 {% endif %}bg-white focus:outline-none border border-gray-300 rounded-lg py-2 px-4 block w-full appearance-none leading-normal text-gray-700" name="{{ field.html_name }}" {{ field.field.widget.attrs|flatatt }}>
     {% for value, label in field.field.choices %}
         {% include "tailwind/layout/select_option.html" with value=value label=label %}
     {% endfor %}

From f3b2a403333bcffee77dce0dd754a7ccf2782577 Mon Sep 17 00:00:00 2001
From: Otu Ekanem <io2@users.noreply.github.com>
Date: Fri, 19 Mar 2021 17:56:48 +0100
Subject: [PATCH 2/5] fixed tests for bug fix related to formset_factor form
 select

---
 tests/test_table_inline_formset.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_table_inline_formset.py b/tests/test_table_inline_formset.py
index 3aab11c..6e86316 100644
--- a/tests/test_table_inline_formset.py
+++ b/tests/test_table_inline_formset.py
@@ -105,7 +105,7 @@ def test_table_inline_formset(self):
                     <td id="div_id_form-0-tos_accepted" class="border px-4 py-2">
                         <div class="border px-4 py-2">
                             <div class="relative">
-                                <select class="bg-white focus:outline-none border border-gray-300 rounded-lg py-2 px-4 block w-full appearance-none leading-normal text-gray-700" name="tos_accepted">
+                                <select class="bg-white focus:outline-none border border-gray-300 rounded-lg py-2 px-4 block w-full appearance-none leading-normal text-gray-700" name="form-1-tos_accepted">
                                     <option value="accepted">Accepted</option>
                                     <option value="not_accepted">Not accepted</option>
                                 </select>
@@ -181,7 +181,7 @@ def test_table_inline_formset(self):
                     <td id="div_id_form-1-tos_accepted" class="border px-4 py-2">
                         <div class="border px-4 py-2">
                             <div class="relative">
-                                <select class="bg-white focus:outline-none border border-gray-300 rounded-lg py-2 px-4 block w-full appearance-none leading-normal text-gray-700" name="tos_accepted">
+                                <select class="bg-white focus:outline-none border border-gray-300 rounded-lg py-2 px-4 block w-full appearance-none leading-normal text-gray-700" name="form-1-tos_accepted">
                                     <option value="accepted">Accepted</option>
                                     <option value="not_accepted">Not accepted</option>
                                 </select>

From 284734a2040b74476489b42da69b703c906b44d8 Mon Sep 17 00:00:00 2001
From: Otu Ekanem <o.ekanem@gmail.com>
Date: Fri, 19 Mar 2021 18:02:49 +0100
Subject: [PATCH 3/5] silly billy / fixed the test

---
 tests/test_table_inline_formset.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_table_inline_formset.py b/tests/test_table_inline_formset.py
index 6e86316..517f4f9 100644
--- a/tests/test_table_inline_formset.py
+++ b/tests/test_table_inline_formset.py
@@ -105,7 +105,7 @@ def test_table_inline_formset(self):
                     <td id="div_id_form-0-tos_accepted" class="border px-4 py-2">
                         <div class="border px-4 py-2">
                             <div class="relative">
-                                <select class="bg-white focus:outline-none border border-gray-300 rounded-lg py-2 px-4 block w-full appearance-none leading-normal text-gray-700" name="form-1-tos_accepted">
+                                <select class="bg-white focus:outline-none border border-gray-300 rounded-lg py-2 px-4 block w-full appearance-none leading-normal text-gray-700" name="form-0-tos_accepted">
                                     <option value="accepted">Accepted</option>
                                     <option value="not_accepted">Not accepted</option>
                                 </select>

From b4ec6318a34c2cb7de38ce1f01d789670d922e56 Mon Sep 17 00:00:00 2001
From: Otu Ekanem <o.ekanem@gmail.com>
Date: Tue, 23 Mar 2021 18:37:14 +0100
Subject: [PATCH 4/5] fixed bug which caused bound forms to lose selected
 option

in forms.ModelForm types, the `select > option` value attribute
is usually set to the primary key of the model object (usually an int)

This commit converts `field.value` to string to ensure the `if` condition
    for adding selected to the <option> is met.

Added tests to better demonstrate the issue
---
 .../templates/tailwind/layout/select.html     |  2 +-
 .../tailwind/layout/select_option.html        |  2 +-
 tests/forms.py                                |  8 ++++++
 tests/test_helper.py                          | 25 +++++++++++++++++++
 4 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/crispy_tailwind/templates/tailwind/layout/select.html b/crispy_tailwind/templates/tailwind/layout/select.html
index ae784f5..fef34ac 100644
--- a/crispy_tailwind/templates/tailwind/layout/select.html
+++ b/crispy_tailwind/templates/tailwind/layout/select.html
@@ -4,7 +4,7 @@
 <div class="relative">
 <select class="{% if field.errors %}border border-red-500 {% endif %}bg-white focus:outline-none border border-gray-300 rounded-lg py-2 px-4 block w-full appearance-none leading-normal text-gray-700" name="{{ field.html_name }}" {{ field.field.widget.attrs|flatatt }}>
     {% for value, label in field.field.choices %}
-        {% include "tailwind/layout/select_option.html" with value=value label=label %}
+        {% include "tailwind/layout/select_option.html" with value=value|stringformat:'s' label=label %}
     {% endfor %}
 </select>
 <div class="pointer-events-none absolute inset-y-0 right-0 flex items-center px-2 text-gray-700">
diff --git a/crispy_tailwind/templates/tailwind/layout/select_option.html b/crispy_tailwind/templates/tailwind/layout/select_option.html
index 2f4364f..afb5a31 100644
--- a/crispy_tailwind/templates/tailwind/layout/select_option.html
+++ b/crispy_tailwind/templates/tailwind/layout/select_option.html
@@ -1,4 +1,4 @@
 {% load crispy_forms_filters %}
 {% load l10n %}
 
-<option value="{{ value|stringformat:'s' }}" {{ field.field.widget.attrs|flatatt }}{% if field.value == value %} selected{% endif %}>{{ label }}</option>
+<option value="{{ value }}" {{ field.field.widget.attrs|flatatt }}{% if field.value|stringformat:'s' == value %} selected{% endif %}>{{ label }}</option>
diff --git a/tests/forms.py b/tests/forms.py
index f317e78..0a4753f 100644
--- a/tests/forms.py
+++ b/tests/forms.py
@@ -63,3 +63,11 @@ class SelectForm(forms.Form):
         widget=forms.Select(),
         choices=(("accepted", "Accepted"), ("not_accepted", "Not accepted")),
     )
+
+
+class AgeRangeSelectForm(forms.Form):
+    age_range = forms.ChoiceField(
+        label="age range",
+        widget=forms.Select(),
+        choices=((0, "18-24"), (1, "25-44"), (2, "45+")),
+    )
diff --git a/tests/test_helper.py b/tests/test_helper.py
index b141bb1..9401d61 100644
--- a/tests/test_helper.py
+++ b/tests/test_helper.py
@@ -15,6 +15,7 @@
     RadioForm,
     SampleForm,
     SelectForm,
+    AgeRangeSelectForm,
     ShortCharFieldForm,
 )
 
@@ -572,3 +573,27 @@ def test_select(self):
         </div>
         """
         self.assertHTMLEqual(html, expected_html)
+
+    def test_select_option_preserved_on_bound_forms(self):
+        form = AgeRangeSelectForm(data={"age_range": 1})
+        form.helper = FormHelper()
+        form.helper.form_tag = False
+        html = render_crispy_form(form)
+        expected_html = """
+        <div id="div_id_age_range" class="mb-3">
+            <label for="id_age_range" class="block text-gray-700 text-sm font-bold mb-2"> age range<span class="asteriskField">*</span> </label>
+            <div class="mb-3">
+                <div class="relative">
+                    <select class="bg-white focus:outline-none border border-gray-300 rounded-lg py-2 px-4 block w-full appearance-none leading-normal text-gray-700" name="age_range">
+                        <option value="0">18-24</option>
+                        <option value="1" selected>25-44</option>
+                        <option value="2">45+</option>
+                    </select>
+                    <div class="pointer-events-none absolute inset-y-0 right-0 flex items-center px-2 text-gray-700">
+                        <svg class="fill-current h-4 w-4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M9.293 12.95l.707.707L15.657 8l-1.414-1.414L10 10.828 5.757 6.586 4.343 8z" /></svg>
+                    </div>
+                </div>
+            </div>
+        </div>
+        """
+        self.assertHTMLEqual(html, expected_html)

From 9fbc19995bde781b668b0f4b14f055ab427d7432 Mon Sep 17 00:00:00 2001
From: Otu Ekanem <o.ekanem@gmail.com>
Date: Tue, 23 Mar 2021 18:59:13 +0100
Subject: [PATCH 5/5] resolve import sorting issue identified by isort

---
 tests/test_helper.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_helper.py b/tests/test_helper.py
index 9401d61..730ac12 100644
--- a/tests/test_helper.py
+++ b/tests/test_helper.py
@@ -9,13 +9,13 @@
 from crispy_tailwind.layout import Button, Reset, Submit
 
 from .forms import (
+    AgeRangeSelectForm,
     CharFieldForm,
     CheckboxMultiple,
     PasswordFieldForm,
     RadioForm,
     SampleForm,
     SelectForm,
-    AgeRangeSelectForm,
     ShortCharFieldForm,
 )