Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Amélioration du tag dsfr_form #98

Merged
merged 1 commit into from
Feb 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions dsfr/forms.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from pathlib import Path

from django import forms
from django.forms import widgets, Form
from django.forms.renderers import DjangoTemplates, get_default_renderer
from django.utils.functional import cached_property

Expand All @@ -21,16 +21,16 @@ def engine(self):
)


class DsfrBaseForm(forms.Form):
class DsfrBaseForm(Form):
"""
A base form that adds the necessary class on relevant fields
"""

# These input widgets don't need the fr-input class
WIDGETS_NO_FR_INPUT = [
forms.widgets.CheckboxInput,
forms.widgets.FileInput,
forms.widgets.ClearableFileInput,
widgets.CheckboxInput,
widgets.FileInput,
widgets.ClearableFileInput,
]

@property
Expand All @@ -55,15 +55,15 @@ def __init__(self, *args, **kwargs):
"""
if "class" not in visible.field.widget.attrs:
if type(visible.field.widget) in [
forms.widgets.Select,
forms.widgets.SelectMultiple,
widgets.Select,
widgets.SelectMultiple,
]:
visible.field.widget.attrs["class"] = "fr-select"
visible.field.widget.group_class = "fr-select-group"
elif type(visible.field.widget) == forms.widgets.RadioSelect:
elif type(visible.field.widget) == widgets.RadioSelect:
visible.field.widget.attrs["dsfr"] = "dsfr"
visible.field.widget.group_class = "fr-radio-group"
elif type(visible.field.widget) == forms.widgets.CheckboxSelectMultiple:
elif type(visible.field.widget) == widgets.CheckboxSelectMultiple:
visible.field.widget.attrs["dsfr"] = "dsfr"
elif type(visible.field.widget) not in self.WIDGETS_NO_FR_INPUT:
visible.field.widget.attrs["class"] = "fr-input"
Expand Down
5 changes: 4 additions & 1 deletion dsfr/templates/dsfr/form_snippet.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
{{ form.non_field_errors }}
</section>
{% endif %}
{% for field in form %}
{% for hidden in form.hidden_fields %}
{{ hidden }}
{% endfor %}
{% for field in form.visible_fields %}
{% include "dsfr/form_field_snippets/field_snippet.html" %}
{% endfor %}
4 changes: 3 additions & 1 deletion example_app/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,11 @@ class ExampleForm(DsfrBaseForm):
sample_json = forms.JSONField(label="Fichier JSON", required=False)

# files

sample_file = forms.FileField(label="Pièce jointe", required=False)

# hidden field
hidden_input = forms.CharField(widget=forms.HiddenInput(), initial="value")

def clean_sample_number(self):
sample_number = self.cleaned_data["sample_number"]

Expand Down
Loading