Skip to content
Snippets Groups Projects
Commit c52c69b9 authored by Martin Mareš's avatar Martin Mareš
Browse files

Merge branch 'honza/pre' into 'master'

Better error messages with preserved line ends

See merge request !40
parents 3fb128fd 0bf64f7d
No related branches found
No related tags found
1 merge request!40Better error messages with preserved line ends
......@@ -11,11 +11,11 @@
{% if errs %}
<h3>Chyby při importu</h3>
<pre><div class="alert alert-danger" role="alert">{{ "" -}}
<div class="alert alert-danger" role="alert" style="white-space: pre-line">{{ "" -}}
{% for e in errs %}
{{ e }}
{% endfor %}
</div></pre>
</div>
{% endif %}
<p>Zde si můžete stáhnout bodovací formulář v zadaném formátu a pak ho nahrát zpět
......
......@@ -24,11 +24,11 @@
{% if has_errors %}
<h3>Chyby</h3>
<pre><div class="alert alert-danger" role="alert">{{ "" -}}
<div class="alert alert-danger" role="alert" style="white-space: pre-line">{{ "" -}}
{% for e in job.out_json['errors'] %}
{{ e }}
{% endfor %}
</div></pre>
</div>
{% endif %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment