Fix error display

main
Alexander Graf 2 years ago
parent 53720876b4
commit b0990460a4
No known key found for this signature in database
GPG Key ID: B8A9DC143E075629

@ -3,7 +3,7 @@
{%- for fieldname, errors in form.errors.items() %} {%- for fieldname, errors in form.errors.items() %}
{%- if bootstrap_is_hidden_field(form[fieldname]) %} {%- if bootstrap_is_hidden_field(form[fieldname]) %}
{%- for error in errors %} {%- for error in errors %}
<p class="error">{{error}}</p> <p class="form-text text-danger">{{error}}</p>
{%- endfor %} {%- endfor %}
{%- endif %} {%- endif %}
{%- endfor %} {%- endfor %}
@ -13,7 +13,7 @@
{%- macro form_field_errors(field) %} {%- macro form_field_errors(field) %}
{%- if field.errors %} {%- if field.errors %}
{%- for error in field.errors %} {%- for error in field.errors %}
<p class="help-block inline">{{ error }}</p> <p class="form-text text-danger">{{ error }}</p>
{%- endfor %} {%- endfor %}
{%- endif %} {%- endif %}
{%- endmacro %} {%- endmacro %}
@ -23,7 +23,7 @@
<div class="form-group"> <div class="form-group">
<div class="row"> <div class="row">
{%- for field in fields %} {%- for field in fields %}
<div class="col-lg-{{ width }} col-xs-12 {{ 'has-error' if field.errors else '' }}"> <div class="col-lg-{{ width }} col-xs-12">
{%- if field.__class__.__name__ == 'list' %} {%- if field.__class__.__name__ == 'list' %}
{%- for subfield in field %} {%- for subfield in field %}
{{ form_individual_field(subfield, prepend=prepend, append=append, label=label, **kwargs) }} {{ form_individual_field(subfield, prepend=prepend, append=append, label=label, **kwargs) }}
@ -38,12 +38,13 @@
{%- endmacro %} {%- endmacro %}
{%- macro form_individual_field(field, prepend='', append='', label=True, class_="") %} {%- macro form_individual_field(field, prepend='', append='', label=True, class_="") %}
{%- set fieldclass=" ".join(["form-control"] + ([class_] if class_ else []) + (["is-invalid"] if field.errors else [])) %}
{%- if field.type == "BooleanField" %} {%- if field.type == "BooleanField" %}
{{ field(**kwargs) }}<span>&nbsp;&nbsp;</span>{{ field.label if label else '' }} {{ field(**kwargs) }}<span>&nbsp;&nbsp;</span>{{ field.label if label else '' }}
{%- else %} {%- else %}
{{ field.label if label else '' }}{{ form_field_errors(field) }} {{ field.label if label else '' }}{{ form_field_errors(field) }}
{%- if prepend %}<div class="input-group-prepend">{%- elif append %}<div class="input-group-append">{%- endif %} {%- if prepend %}<div class="input-group-prepend">{%- elif append %}<div class="input-group-append">{%- endif %}
{{ prepend|safe }}{{ field(class_=("form-control " + class_) if class_ else "form-control", **kwargs) }}{{ append|safe }} {{ prepend|safe }}{{ field(class_=fieldclass, **kwargs) }}{{ append|safe }}
{%- if prepend or append %}</div>{%- endif %} {%- if prepend or append %}</div>{%- endif %}
{%- endif %} {%- endif %}
{%- endmacro %} {%- endmacro %}

Loading…
Cancel
Save