Skip to content

Added Django 5.2. support. #34

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.

Sign up for GitHub

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Added Django 5.2. support. #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## Next Release

* Added support for Python 3.13.
* Added support for Django 5.2.

## 2024.10 (2024-10-05)

Expand Down
7 changes: 7 additions & 0 deletions crispy_bootstrap4/templates/bootstrap4/layout/field_errors.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
{% if form_show_errors and field.errors %}
{% if field.errors.field_id %}
{# Django 5.2+ #}
<div id="{{field.errors.field_id}}_error" class="invalid-feedback">
{% else %}
<div id="{{field.auto_id}}_error" class="invalid-feedback">
{% endif %}
{% for error in field.errors %}
<span id="error_{{ forloop.counter }}_{{ field.auto_id }}" class="invalid-feedback"><strong>{{ error }}</strong></span>
{% endfor %}
</div>
{% endif %}
7 changes: 7 additions & 0 deletions crispy_bootstrap4/templates/bootstrap4/layout/field_errors_block.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
{% if form_show_errors and field.errors %}
{% if field.errors.field_id %}
{# Django 5.2+ #}
<div id="{{field.errors.field_id}}_error" class="invalid-feedback">
{% else %}
<div id="{{field.auto_id}}_error" class="invalid-feedback">
{% endif %}
{% for error in field.errors %}
<p id="error_{{ forloop.counter }}_{{ field.auto_id }}" class="invalid-feedback"><strong>{{ error }}</strong></p>
{% endfor %}
</div>
{% endif %}
5 changes: 3 additions & 2 deletions tests/results/bootstrap4/test_form_helper/bootstrap_form_show_errors_bs4_false.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<label for="id_email" class=" requiredField"> email<span class="asteriskField">*</span> </label>
<div class="">
<div class="input-group">
<input type="text" name="email" value="invalidemail" maxlength="30" aria-describedby="id_email_helptext" aria-invalid="true"
<input type="text" name="email" value="invalidemail" maxlength="30" aria-describedby="id_email_helptext id_email_error" aria-invalid="true"
class="textinput textInput inputtext form-control is-invalid" required id="id_email" />
<div class="input-group-append"><span class="input-group-text">whatever</span></div>
</div>
Expand All @@ -24,6 +24,7 @@
required
id="id_first_name"
aria-invalid="true"
aria-describedby="id_first_name_error"
/>
</div>
</div>
Expand All @@ -33,7 +34,7 @@
<div class="">
<div class="input-group">
<div class="input-group-prepend"><span class="input-group-text">foo</span></div>
<input type="text" name="last_name" value="last_name_too_long" maxlength="5" aria-invalid="true"
<input type="text" name="last_name" value="last_name_too_long" maxlength="5" aria-invalid="true" aria-describedby="id_last_name_error"
class="textinput textInput inputtext form-control is-invalid" required id="id_last_name" />
<div class="input-group-append"><span class="input-group-text">bar</span></div>
</div>
Expand Down
72 changes: 72 additions & 0 deletions tests/results/bootstrap4/test_form_helper/bootstrap_form_show_errors_bs4_false_lt52.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
<form method="post">
<div id="div_id_email" class="form-group">
<label for="id_email" class=" requiredField"> email<span class="asteriskField">*</span> </label>
<div class="">
<div class="input-group">
<input type="text" name="email" value="invalidemail" maxlength="30" aria-describedby="id_email_helptext" aria-invalid="true"
class="textinput textInput inputtext form-control is-invalid" required id="id_email" />
<div class="input-group-append"><span class="input-group-text">whatever</span></div>
</div>
<small id="hint_id_email" class="form-text text-muted">Insert your email</small>
</div>
</div>
<div id="div_id_first_name" class="form-group">
<label for="id_first_name" class=" requiredField">first name<span class="asteriskField">*</span> </label>
<div class="">
<div class="input-group">
<div class="input-group-prepend"><span class="input-group-text">blabla</span></div>
<input
type="text"
name="first_name"
value="first_name_too_long"
maxlength="5"
class="textinput textInput inputtext form-control is-invalid"
required
id="id_first_name"
aria-invalid="true"
/>
</div>
</div>
</div>
<div id="div_id_last_name" class="form-group">
<label for="id_last_name" class=" requiredField">last name<span class="asteriskField">*</span> </label>
<div class="">
<div class="input-group">
<div class="input-group-prepend"><span class="input-group-text">foo</span></div>
<input type="text" name="last_name" value="last_name_too_long" maxlength="5" aria-invalid="true"
class="textinput textInput inputtext form-control is-invalid" required id="id_last_name" />
<div class="input-group-append"><span class="input-group-text">bar</span></div>
</div>
</div>
</div>
<div id="div_id_password1" class="form-group">
<label for="id_password1" class=" requiredField">password<span class="asteriskField">*</span> </label>
<div class="">
<div class="input-group">
<input type="password" name="password1" maxlength="30" class="textinput textInput form-control" required id="id_password1" />
<div class="input-group-append"><span class="input-group-text">whatever</span></div>
</div>
</div>
</div>
<div id="div_id_password2" class="form-group">
<label
for="id_password2"
class=" requiredField"
>
re-enter password<span class="asteriskField">*</span>
</label>
<div class="">
<div class="input-group">
<div class="input-group-prepend"><span class="input-group-text">blabla</span></div>
<input
type="password"
name="password2"
maxlength="30"
class="textinput textInput form-control"
required
id="id_password2"
/>
</div>
</div>
</div>
</form>
19 changes: 13 additions & 6 deletions tests/results/bootstrap4/test_form_helper/bootstrap_form_show_errors_bs4_true.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@
<label for="id_email" class=" requiredField"> email<span class="asteriskField">*</span> </label>
<div class="">
<div class="input-group">
<input type="text" name="email" value="invalidemail" maxlength="30" aria-invalid="true" aria-describedby="id_email_helptext"
<input type="text" name="email" value="invalidemail" maxlength="30" aria-invalid="true" aria-describedby="id_email_helptext id_email_error"
class="textinput textInput inputtext form-control is-invalid" required id="id_email" />
<div class="input-group-append"><span class="input-group-text">whatever</span></div>
<span id="error_1_id_email" class="invalid-feedback"><strong>Enter a valid email address.</strong></span>
<div class="invalid-feedback" id="id_email_error">
<span id="error_1_id_email" class="invalid-feedback"><strong>Enter a valid email address.</strong></span>
</div>
</div>
<small id="hint_id_email" class="form-text text-muted">Insert your email</small>
<small id="hint_id_email" class="form-text text-muted">Insert your email</small>
</div>
</div>
<div id="div_id_first_name" class="form-group">
Expand All @@ -21,9 +23,11 @@
<div class="">
<div class="input-group">
<div class="input-group-prepend"><span class="input-group-text">blabla</span></div>
<input type="text" name="first_name" value="first_name_too_long" maxlength="5" aria-invalid="true"
<input type="text" name="first_name" value="first_name_too_long" maxlength="5" aria-invalid="true" aria-describedby="id_first_name_error"
class="textinput textInput inputtext form-control is-invalid" required id="id_first_name" />
<span id="error_1_id_first_name" class="invalid-feedback"><strong>Ensure this value has at most 5 characters (it has 19).</strong></span>
<div class="invalid-feedback" id="id_first_name_error">
<span id="error_1_id_first_name" class="invalid-feedback"><strong>Ensure this value has at most 5 characters (it has 19).</strong></span>
</div>
</div>
</div>
</div>
Expand All @@ -41,9 +45,12 @@
required
id="id_last_name"
aria-invalid="true"
aria-describedby="id_last_name_error"
/>
<div class="input-group-append"><span class="input-group-text">bar</span></div>
<span id="error_1_id_last_name" class="invalid-feedback"><strong>Ensure this value has at most 5 characters (it has 18).</strong></span>
<div class="invalid-feedback" id="id_last_name_error">
<span id="error_1_id_last_name" class="invalid-feedback"><strong>Ensure this value has at most 5 characters (it has 18).</strong></span>
</div>
</div>
</div>
</div>
Expand Down
12 changes: 9 additions & 3 deletions tests/results/bootstrap4/test_form_helper/bootstrap_form_show_errors_bs4_true_lt50.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
<div class="input-group">
<input type="text" name="email" value="invalidemail" maxlength="30" class="textinput textInput inputtext form-control is-invalid" required id="id_email" />
<div class="input-group-append"><span class="input-group-text">whatever</span></div>
<span id="error_1_id_email" class="invalid-feedback"><strong>Enter a valid email address.</strong></span>
<div class="invalid-feedback" id="id_email_error">
<span id="error_1_id_email" class="invalid-feedback"><strong>Enter a valid email address.</strong></span>
</div>
</div>
<small id="hint_id_email" class="form-text text-muted">Insert your email</small>
</div>
Expand All @@ -21,7 +23,9 @@
<div class="input-group">
<div class="input-group-prepend"><span class="input-group-text">blabla</span></div>
<input type="text" name="first_name" value="first_name_too_long" maxlength="5" class="textinput textInput inputtext form-control is-invalid" required id="id_first_name" />
<span id="error_1_id_first_name" class="invalid-feedback"><strong>Ensure this value has at most 5 characters (it has 19).</strong></span>
<div class="invalid-feedback" id="id_first_name_error">
<span id="error_1_id_first_name" class="invalid-feedback"><strong>Ensure this value has at most 5 characters (it has 19).</strong></span>
</div>
</div>
</div>
</div>
Expand All @@ -40,7 +44,9 @@
id="id_last_name"
/>
<div class="input-group-append"><span class="input-group-text">bar</span></div>
<span id="error_1_id_last_name" class="invalid-feedback"><strong>Ensure this value has at most 5 characters (it has 18).</strong></span>
<div class="invalid-feedback" id="id_last_name_error">
<span id="error_1_id_last_name" class="invalid-feedback"><strong>Ensure this value has at most 5 characters (it has 18).</strong></span>
</div>
</div>
</div>
</div>
Expand Down
77 changes: 77 additions & 0 deletions tests/results/bootstrap4/test_form_helper/bootstrap_form_show_errors_bs4_true_lt52.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<form method="post">
<div id="div_id_email" class="form-group">
<label for="id_email" class=" requiredField"> email<span class="asteriskField">*</span> </label>
<div class="">
<div class="input-group">
<input type="text" name="email" value="invalidemail" maxlength="30" aria-invalid="true" aria-describedby="id_email_helptext"
class="textinput textInput inputtext form-control is-invalid" required id="id_email" />
<div class="input-group-append"><span class="input-group-text">whatever</span></div>
<div class="invalid-feedback" id="id_email_error">
<span id="error_1_id_email" class="invalid-feedback"><strong>Enter a valid email address.</strong></span>
</div>
</div>
<small id="hint_id_email" class="form-text text-muted">Insert your email</small>
</div>
</div>
<div id="div_id_first_name" class="form-group">
<label
for="id_first_name"
class=" requiredField"
>
first name<span class="asteriskField">*</span>
</label>
<div class="">
<div class="input-group">
<div class="input-group-prepend"><span class="input-group-text">blabla</span></div>
<input type="text" name="first_name" value="first_name_too_long" maxlength="5" aria-invalid="true"
class="textinput textInput inputtext form-control is-invalid" required id="id_first_name" />
<div class="invalid-feedback" id="id_first_name_error">
<span id="error_1_id_first_name" class="invalid-feedback"><strong>Ensure this value has at most 5 characters (it has 19).</strong></span>
</div>
</div>
</div>
</div>
<div id="div_id_last_name" class="form-group">
<label for="id_last_name" class=" requiredField"> last name<span class="asteriskField">*</span> </label>
<div class="">
<div class="input-group">
<div class="input-group-prepend"><span class="input-group-text">foo</span></div>
<input
type="text"
name="last_name"
value="last_name_too_long"
maxlength="5"
class="textinput textInput inputtext form-control is-invalid"
required
id="id_last_name"
aria-invalid="true"
/>
<div class="input-group-append"><span class="input-group-text">bar</span></div>
<div class="invalid-feedback" id="id_last_name_error">
<span id="error_1_id_last_name" class="invalid-feedback"><strong>Ensure this value has at most 5 characters (it has 18).</strong></span>
</div>
</div>
</div>
</div>
<div
id="div_id_password1"
class="form-group"
>
<label for="id_password1" class=" requiredField"> password<span class="asteriskField">*</span> </label>
<div class="">
<div class="input-group">
<input type="password" name="password1" maxlength="30" class="textInput textinput form-control" required id="id_password1" />
<div class="input-group-append"><span class="input-group-text">whatever</span></div>
</div>
</div>
</div>
<div id="div_id_password2" class="form-group">
<label for="id_password2" class=" requiredField"> re-enter password<span class="asteriskField">*</span> </label>
<div class="">
<div class="input-group">
<div class="input-group-prepend"><span class="input-group-text">blabla</span></div>
<input type="password" name="password2" maxlength="30" class="textInput textinput form-control" required id="id_password2" />
</div>
</div>
</div>
</form>
6 changes: 3 additions & 3 deletions tests/results/bootstrap4/test_form_helper/test_form_show_errors_non_field_errors_false.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</div>
<div id="div_id_email" class="form-group"> <label for="id_email" class=" requiredField"> email<span
class="asteriskField">*</span> </label>
<div> <input type="text" name="email" maxlength="30" aria-describedby="id_email_helptext" aria-invalid="true"
<div> <input type="text" name="email" maxlength="30" aria-describedby="id_email_helptext id_email_error" aria-invalid="true"
class="textinput textInput inputtext form-control is-invalid" required id="id_email"> <small
id="hint_id_email" class="form-text text-muted">Insert your email</small> </div>
</div>
Expand All @@ -22,12 +22,12 @@
</div>
<div id="div_id_first_name" class="form-group"> <label for="id_first_name" class=" requiredField"> first name<span
class="asteriskField">*</span> </label>
<div> <input type="text" name="first_name" maxlength="5" aria-invalid="true"
<div> <input type="text" name="first_name" maxlength="5" aria-invalid="true" aria-describedby="id_first_name_error"
class="textinput textInput inputtext form-control is-invalid" required id="id_first_name"> </div>
</div>
<div id="div_id_last_name" class="form-group"> <label for="id_last_name" class=" requiredField"> last name<span
class="asteriskField">*</span> </label>
<div> <input type="text" name="last_name" maxlength="5" aria-invalid="true"
<div> <input type="text" name="last_name" maxlength="5" aria-invalid="true" aria-describedby="id_last_name_error"
class="textinput textInput inputtext form-control is-invalid" required id="id_last_name"> </div>
</div>
<div id="div_id_datetime_field" class="form-group">
Expand Down
40 changes: 40 additions & 0 deletions ...esults/bootstrap4/test_form_helper/test_form_show_errors_non_field_errors_false_lt52.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<form method="post">
<div class="form-group">
<div id="div_id_is_company" class="custom-control custom-checkbox"> <input type="checkbox" name="is_company"
class="checkboxinput custom-control-input" id="id_is_company"> <label for="id_is_company"
class="custom-control-label"> company </label> </div>
</div>
<div id="div_id_email" class="form-group"> <label for="id_email" class=" requiredField"> email<span
class="asteriskField">*</span> </label>
<div> <input type="text" name="email" maxlength="30" aria-describedby="id_email_helptext" aria-invalid="true"
class="textinput textInput inputtext form-control is-invalid" required id="id_email"> <small
id="hint_id_email" class="form-text text-muted">Insert your email</small> </div>
</div>
<div id="div_id_password1" class="form-group"> <label for="id_password1" class=" requiredField"> password<span
class="asteriskField">*</span> </label>
<div> <input type="password" name="password1" maxlength="30" class="textinput textInput form-control" required
id="id_password1"> </div>
</div>
<div id="div_id_password2" class="form-group"> <label for="id_password2" class=" requiredField"> re-enter
password<span class="asteriskField">*</span> </label>
<div> <input type="password" name="password2" maxlength="30" class="textinput textInput form-control" required
id="id_password2"> </div>
</div>
<div id="div_id_first_name" class="form-group"> <label for="id_first_name" class=" requiredField"> first name<span
class="asteriskField">*</span> </label>
<div> <input type="text" name="first_name" maxlength="5" aria-invalid="true"
class="textinput textInput inputtext form-control is-invalid" required id="id_first_name"> </div>
</div>
<div id="div_id_last_name" class="form-group"> <label for="id_last_name" class=" requiredField"> last name<span
class="asteriskField">*</span> </label>
<div> <input type="text" name="last_name" maxlength="5" aria-invalid="true"
class="textinput textInput inputtext form-control is-invalid" required id="id_last_name"> </div>
</div>
<div id="div_id_datetime_field" class="form-group">
<label class=" requiredField">date time<span class="asteriskField">*</span> </label>
<div> <input type="text" name="datetime_field_0" class="dateinput form-control is-invalid" required
id="id_datetime_field_0" aria-invalid="true"><input type="text" name="datetime_field_1"
aria-invalid="true" class="timeinput form-control is-invalid" required id="id_datetime_field_1">
</div>
</div>
</form>
Loading