From c341a05f02b39c803c8737b8162e1ba249c1b1a3 Mon Sep 17 00:00:00 2001
From: Sylvain Boissel <sylvain@ashtree.eu>
Date: Thu, 9 Feb 2023 15:41:12 +0100
Subject: [PATCH] Fix the radio select widgets (#40)

---
 dsfr/forms.py                                 |  1 +
 .../django/forms/widgets/radio_option.html    | 13 +++++++++++++
 .../checkboxselectmultiple_snippet.html       |  2 +-
 .../form_field_snippets/field_snippet.html    |  2 ++
 .../radioselect_snippet.html                  | 19 +++++++++++++++++++
 pyproject.toml                                |  2 +-
 6 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 dsfr/templates/django/forms/widgets/radio_option.html
 create mode 100644 dsfr/templates/dsfr/form_field_snippets/radioselect_snippet.html

diff --git a/dsfr/forms.py b/dsfr/forms.py
index eb4f7ebcc..2d6bd08e8 100644
--- a/dsfr/forms.py
+++ b/dsfr/forms.py
@@ -31,6 +31,7 @@ def __init__(self, *args, **kwargs):
                     visible.field.widget.attrs["class"] = "fr-select"
                     visible.field.widget.group_class = "fr-select-group"
                 elif type(visible.field.widget) == forms.widgets.RadioSelect:
+                    visible.field.widget.attrs["dsfr"] = "dsfr"
                     visible.field.widget.group_class = "fr-radio-group"
                 elif type(visible.field.widget) == forms.widgets.CheckboxSelectMultiple:
                     visible.field.widget.attrs["dsfr"] = "dsfr"
diff --git a/dsfr/templates/django/forms/widgets/radio_option.html b/dsfr/templates/django/forms/widgets/radio_option.html
new file mode 100644
index 000000000..d880ef52b
--- /dev/null
+++ b/dsfr/templates/django/forms/widgets/radio_option.html
@@ -0,0 +1,13 @@
+{% if widget.attrs.dsfr == "dsfr" %}<div class="fr-radio-group">{% endif %}
+{% include "django/forms/widgets/input.html" %}
+{% if widget.wrap_label %}
+	<label class="fr-label"{% if widget.attrs.id %} for="{{ widget.attrs.id }}"{% endif %}>
+		{% if widget.label.label %}
+			{{ widget.label.label }}
+			<span class="fr-hint-text">{{ widget.label.help_text }}</span>
+		{% else %}
+			{{ widget.label }}
+		{% endif %}
+	</label>
+{% endif %}
+{% if widget.attrs.dsfr == "dsfr" %}</div>{% endif %}
\ No newline at end of file
diff --git a/dsfr/templates/dsfr/form_field_snippets/checkboxselectmultiple_snippet.html b/dsfr/templates/dsfr/form_field_snippets/checkboxselectmultiple_snippet.html
index ca37c7cba..53df1c358 100644
--- a/dsfr/templates/dsfr/form_field_snippets/checkboxselectmultiple_snippet.html
+++ b/dsfr/templates/dsfr/form_field_snippets/checkboxselectmultiple_snippet.html
@@ -1,7 +1,7 @@
 {% load widget_tweaks %}
 <div class="fr-form-group{% if field.errors %} fr-form-group--error{% endif %}{% if field.field.disabled %} fr-form-group--disabled{% endif %}">
   <fieldset class="fr-fieldset">
-    <legend class="fr-fieldset__legend fr-text--regular" id='checkboxes-legend'>
+    <legend class="fr-fieldset__legend fr-text--regular" id="checkboxes-legend-{{ field.auto_id }}">
       {{ field.label_tag }}{% if field.field.required %} *{% endif %}
       {% if field.help_text %}<span class="fr-hint-text">{{ field.help_text }}</span>{% endif %}
     </legend>
diff --git a/dsfr/templates/dsfr/form_field_snippets/field_snippet.html b/dsfr/templates/dsfr/form_field_snippets/field_snippet.html
index 057f6af64..e5f514435 100644
--- a/dsfr/templates/dsfr/form_field_snippets/field_snippet.html
+++ b/dsfr/templates/dsfr/form_field_snippets/field_snippet.html
@@ -4,6 +4,8 @@
   {% include "dsfr/form_field_snippets/checkbox_snippet.html" %}
 {% elif field|widget_type == "checkboxselectmultiple" %}
   {% include "dsfr/form_field_snippets/checkboxselectmultiple_snippet.html" %}
+{% elif field|widget_type == "radioselect" %}
+  {% include "dsfr/form_field_snippets/radioselect_snippet.html" %}
 {% else %}
   {% include "dsfr/form_field_snippets/input_snippet.html" %}
 {% endif %}
\ No newline at end of file
diff --git a/dsfr/templates/dsfr/form_field_snippets/radioselect_snippet.html b/dsfr/templates/dsfr/form_field_snippets/radioselect_snippet.html
new file mode 100644
index 000000000..2d8719efe
--- /dev/null
+++ b/dsfr/templates/dsfr/form_field_snippets/radioselect_snippet.html
@@ -0,0 +1,19 @@
+{% load widget_tweaks %}
+<div class="fr-form-group{% if field.errors %} fr-form-group--error{% endif %}{% if field.field.disabled %} fr-form-group--disabled{% endif %}">
+  <fieldset class="fr-fieldset">
+    <legend class="fr-fieldset__legend fr-text--regular" id="radio-legend-{{ field.auto_id }}">
+      {{ field.label_tag }}{% if field.field.required %} *{% endif %}
+      {% if field.help_text %}<span class="fr-hint-text">{{ field.help_text }}</span>{% endif %}
+    </legend>
+
+    <div class="fr-fieldset__content">
+      {{ field|add_class:"fr-radio-group" }}
+    </div>
+
+    {% if field.errors %}
+      <div id="{{ field.auto_id }}-desc-error" class="fr-error-text">
+        {{ field.errors }}
+      </div>
+    {% endif %}
+  </fieldset>
+</div>
diff --git a/pyproject.toml b/pyproject.toml
index 6157e4f28..c79ef885f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,7 +3,7 @@ authors = ["Sylvain Boissel <sylvain.boissel@beta.gouv.fr>"]
 description = "Integrate the French government Design System into a Django app"
 license = "MIT"
 name = "django-dsfr"
-version = "0.13.0"
+version = "0.13.1"
 classifiers = [
   "Development Status :: 3 - Alpha",
   "Environment :: Web Environment",