Commit d59d5e49 authored by cermak's avatar cermak
Browse files

FIX: linebreaks in experiment description

parent e2f57c7a
......@@ -2,7 +2,7 @@
{% for object in events %}
{
"title": "{% if object.shared_option %}{{object.shared_option}} at {{object.instrument}} ({{object.proposal.pid}}){% else %}{{object.proposal.pid}}: {{object.responsible}}{% endif %}",
"description": "User: {{object.responsible}} {{object.responsible.nice_phone|safe}}<br />{% if request.user|in_team:object.proposal %}{{object.proposal.name}} ({{object.proposal.proposer.contact}})<br /><i>{{object.description}}</i><br />{% endif %}LC: {{object.local_contact}} {{object.local_contact.nice_phone|safe}}",
"description": "User: {{object.responsible}} {{object.responsible.nice_phone|safe}}<br />{% if request.user|in_team:object.proposal %}{{object.proposal.name}} ({{object.proposal.proposer.contact}})<br /><i>{{object.description | escapejs}}</i><br />{% endif %}LC: {{object.local_contact}} {{object.local_contact.nice_phone|safe}}",
"url": "{{object.get_absolute_url}}",
"allDay": {% if object.instrument.book_by_hour %}false{% else %}true{% endif %},
"start": "{{ object.start|date:"c" }}",
......
......@@ -19,7 +19,7 @@
{% if showDetails or request.user.contact == object.local_contact %}
<tr><td>Options:</td><td>{% for o in object.option.all %}{% include "comma.html" %}{{ o }}{% endfor %}</td></tr>
<tr><td>Shared resources:</td><td>{% for so in object.sharedoptionslot_set.all %}{% include "comma.html" %}<a href="{% url 'app_sharedoptionslot_detail' pk=so.pk %}">{{ so }}</a>{% endfor %}</td></tr>
<tr><td>Description:</td><td>{{ object.description|default:"-" }}</td></tr>
<tr><td>Description:</td><td>{{ object.description|default:"-"|linebreaks }}</td></tr>
{% endif %}
</table>
{% endwith %}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment