diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-11-27 11:26:55 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-02-28 12:15:21 +0100 |
| commit | 975b971ae6efacbd5614be7f057f32d7c302966b (patch) | |
| tree | 300713d38252ed0fb9d25e48e8499b29523b7985 /ishtar_common/templates | |
| parent | 30bf32d6768f3c013b44e1ed76d94f9954d6e565 (diff) | |
| download | Ishtar-975b971ae6efacbd5614be7f057f32d7c302966b.tar.bz2 Ishtar-975b971ae6efacbd5614be7f057f32d7c302966b.zip | |
Documents: dynamic filter of support and medium by document type - collapse related fields on edition
Diffstat (limited to 'ishtar_common/templates')
| -rw-r--r-- | ishtar_common/templates/blocks/bs_form_snippet.html | 2 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/forms/document.html | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/ishtar_common/templates/blocks/bs_form_snippet.html b/ishtar_common/templates/blocks/bs_form_snippet.html index e24220005..3d84ce3dc 100644 --- a/ishtar_common/templates/blocks/bs_form_snippet.html +++ b/ishtar_common/templates/blocks/bs_form_snippet.html @@ -1,5 +1,5 @@ {% load i18n from_dict %} -{% if form.non_field_errors %} +{% if form.non_field_errors and not no_error %} <div class="alert alert-danger" role="alert"> {{form.non_field_errors}} </div> diff --git a/ishtar_common/templates/ishtar/forms/document.html b/ishtar_common/templates/ishtar/forms/document.html index ed5a39daf..8e2683a03 100644 --- a/ishtar_common/templates/ishtar/forms/document.html +++ b/ishtar_common/templates/ishtar/forms/document.html @@ -13,18 +13,18 @@ <div class='form{% if not form.SEARCH_AND_SELECT %} container{% endif %}'> {% if form.non_field_errors or form.errors %} <div class="alert alert-danger"> - <div><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> - {% trans "Error on validation. Check all your fields. Modification not saved." %} + <div><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> + {% trans "Error on validation. Check all your fields. Modification not saved." %} + </div> + {% for key, error_details in form.errors.items %} + {% with field=key|from_dict:form.fields %}<strong>{{ field.label }}</strong>{{error_details}}{% endwith %} + {% endfor %} </div> - {% for error in form.non_field_errors %} - <p>{{ error }}</p> - {% endfor %} - {% for key, error_details in form.errors.items %} - {% with field=key|from_dict:form.fields %}<strong>{{ field.label }}</strong>{{error_details}}{% endwith %} - {% endfor %} -</div> {% endif %} - {% bs_form form %} + {% if item_related_label %}<div class="alert alert-info"> + <strong>{% trans "Related items" %}{% trans ":" %}</strong> {{ item_related_label }} + </div>{% endif %} + {% bs_form form 0 True %} </div> {% endblock %} |