diff --git a/validata_ui/templates/validation_macros.html b/validata_ui/templates/validation_macros.html index 56deb89cffa1264c3464555a335497aa81c98c0d..f0ab26aec0e994fdbe66873a1c7cc2f9bf2d40e6 100644 --- a/validata_ui/templates/validation_macros.html +++ b/validata_ui/templates/validation_macros.html @@ -124,7 +124,6 @@

Aucune erreur de structure.

{% endif %} -{% if report.table.do_display_body_errors %} {% set value_errors = report.table['error-stats']['value-errors'] %} {% if value_errors['count'] > 0 %}

Erreur de contenu ({{ value_errors['count'] }} sur {{ value_errors['rows-count'] }} ligne{% if value_errors['rows-count'] > 1 %}s{% endif %}) :

@@ -136,6 +135,5 @@ {% else %}

Aucune erreur de contenu

{% endif %} -{% endif %} {% endmacro %} diff --git a/validata_ui/templates/validation_report.html b/validata_ui/templates/validation_report.html index d641e977ac1b54b75364fe2accfd21481a42a8d5..7d347e5c04ebc4275a5a4bab9bbb9716a3037a0c 100644 --- a/validata_ui/templates/validation_report.html +++ b/validata_ui/templates/validation_report.html @@ -139,18 +139,15 @@ {% endif %} -{% if report.table.do_display_body_errors %} {# We do display body errors! #} -
- {% if report.table.errors.body %} -

Erreurs de contenu

- {{ macros.body_errors(report, source_data, print_mode) }} - {% else %} - {{ macros.preview(source_data) }} - {% endif %} -
-{% else %} {# do not display errors #} -

Veuillez corriger ces erreurs pour visualiser les éventuelles erreurs de contenu.

-{% endif %} +{# Display body errors #} +
+ {% if report.table.errors.body %} +

Erreurs de contenu

+ {{ macros.body_errors(report, source_data, print_mode) }} + {% else %} + {{ macros.preview(source_data) }} + {% endif %} +
{% endblock %} {% block page_scripts %} diff --git a/validata_ui/views.py b/validata_ui/views.py index c890e55aa41d17166d9cf6aa0e00f4719006f38d..3a892b65af52c758ea18a95d66a6182555155281 100644 --- a/validata_ui/views.py +++ b/validata_ui/views.py @@ -244,9 +244,6 @@ def create_validata_ui_report(validata_core_report, schema_dict): else: report['table']['errors']['body'].append(err) - # Always displays body errors - report['table']['do_display_body_errors'] = True - # Checks if a column comparison is needed report['table']['column_comparison_needed'] = False