Skip to content

Commit

Permalink
Fixed field_class applied two times for field_file #108
Browse files Browse the repository at this point in the history
  • Loading branch information
@smithdc1
smithdc1 committed Jul 5, 2022
1 parent cdc2716 commit 67e31ce
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 44 deletions.
2 changes: 0 additions & 2 deletions crispy_bootstrap5/templates/bootstrap5/layout/field_file.html
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{% load crispy_forms_field %}

<div class="{{ field_class }} mb-2">
{% for widget in field.subwidgets %}
{% if widget.data.is_initial %}
<div class="input-group mb-2">
Expand All @@ -25,4 +24,3 @@
{% include 'bootstrap5/layout/help_text_and_errors.html' %}
</div>
{% endfor %}
</div>
35 changes: 17 additions & 18 deletions tests/results/test_clearable_file_field.html
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
<form method="post" enctype="multipart/form-data">
<form method="post" enctype="multipart/form-data">
<div id="div_id_clearable_file" class="mb-3">
<label for="id_clearable_file" class="form-label">Clearable file</label>
<div class=" mb-2">
<div class="input-group mb-2">
<span class="input-group-text">Currently</span>
<div class="form-control d-flex h-auto">
<span class="text-break" style="flex-grow:1;min-width:0">
<a href="something"></a>
<div class="input-group mb-2">
<span class="input-group-text">Currently</span>
<div class="form-control d-flex h-auto">
<span class="text-break" style="flex-grow:1;min-width:0">
<a href="something"></a>
</span>
<span class="align-self-center ml-2">
<span class="form-check">
<input type="checkbox" name="clearable_file-clear" id="clearable_file-clear_id"
class="form-check-input">
<label class="form-check-label mb-0" for="clearable_file-clear_id">Clear</label>
</span>
<span class="align-self-center ml-2">
<span class="form-check">
<input type="checkbox" name="clearable_file-clear" id="clearable_file-clear_id" class="form-check-input" >
<label class="form-check-label mb-0" for="clearable_file-clear_id">Clear</label>
</span>
</span>
</div>
</div>
<div>
<input type="file" name="clearable_file" class="form-control" id="id_clearable_file">
</span>
</div>
</div>
<div>
<input type="file" name="clearable_file" class="form-control" id="id_clearable_file">
</div>
</div>
</form>
</form>
16 changes: 7 additions & 9 deletions tests/results/test_clearable_file_field_failing.html
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
<form method="post" enctype="multipart/form-data">
<form method="post" enctype="multipart/form-data">
<div id="div_id_clearable_file" class="mb-3">
<label for="id_clearable_file" class="form-label requiredField">
Clearable file
<span class="asteriskField">*</span>
</label>
<div class=" mb-2">
<div class="is-invalid">
<input type="file" name="clearable_file" class="form-control is-invalid" id="id_clearable_file" required>
<span id="error_1_id_clearable_file" class="invalid-feedback">
<strong>This field is required.</strong>
</span>
</div>
<div class="is-invalid">
<input type="file" name="clearable_file" class="form-control is-invalid" id="id_clearable_file" required>
<span id="error_1_id_clearable_file" class="invalid-feedback">
<strong>This field is required.</strong>
</span>
</div>
</div>
</form>
</form>
10 changes: 4 additions & 6 deletions tests/results/test_file_field.html
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
<form method="post" enctype="multipart/form-data">
<form method="post" enctype="multipart/form-data">
<div id="div_id_file_field" class="mb-3">
<label for="id_file_field" class="form-label requiredField">
File field
<span class="asteriskField">*</span>
</label>
<div class=" mb-2">
<div>
<input type="file" name="file_field" class="form-control" id="id_file_field" required>
</div>
<div>
<input type="file" name="file_field" class="form-control" id="id_file_field" required>
</div>
</div>
</form>
</form>
16 changes: 7 additions & 9 deletions tests/results/test_file_field_failing.html
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
<form method="post" enctype="multipart/form-data">
<form method="post" enctype="multipart/form-data">
<div id="div_id_file_field" class="mb-3">
<label for="id_file_field" class="form-label requiredField">
File field
<span class="asteriskField">*</span>
</label>
<div class=" mb-2">
<div class="is-invalid">
<input type="file" name="file_field" class="form-control is-invalid" id="id_file_field" required>
<span id="error_1_id_file_field" class="invalid-feedback">
<strong>This field is required.</strong>
</span>
</div>
<div class="is-invalid">
<input type="file" name="file_field" class="form-control is-invalid" id="id_file_field" required>
<span id="error_1_id_file_field" class="invalid-feedback">
<strong>This field is required.</strong>
</span>
</div>
</div>
</form>
</form>

0 comments on commit 67e31ce

Please sign in to comment.