From 37f5f1afc10f2e56dc9d546757c65eb98a3ec87e Mon Sep 17 00:00:00 2001
From: Tobias Bengfort <bengfort@mpib-berlin.mpg.de>
Date: Tue, 1 Dec 2020 15:00:52 +0100
Subject: [PATCH] use urlize filter wherever we use linebreaks

---
 .../execution/participation_appointments_form.html     |  2 +-
 .../templates/execution/participation_criteria.html    |  6 +++---
 .../recruitment/templates/recruitment/contact.html     | 10 +++++-----
 castellum/studies/templates/studies/study_detail.html  |  2 +-
 .../templates/studies/study_exclusioncriteria.html     |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/castellum/execution/templates/execution/participation_appointments_form.html b/castellum/execution/templates/execution/participation_appointments_form.html
index dec931f4c..3cb340aa6 100644
--- a/castellum/execution/templates/execution/participation_appointments_form.html
+++ b/castellum/execution/templates/execution/participation_appointments_form.html
@@ -3,7 +3,7 @@
 
 {% block content %}
     {% if study.session_instructions %}
-        {{ study.session_instructions|linebreaks }}
+        {{ study.session_instructions|urlize|linebreaks }}
     {% endif %}
 
     <form method="post">
diff --git a/castellum/execution/templates/execution/participation_criteria.html b/castellum/execution/templates/execution/participation_criteria.html
index 4509e34f4..ec2478361 100644
--- a/castellum/execution/templates/execution/participation_criteria.html
+++ b/castellum/execution/templates/execution/participation_criteria.html
@@ -3,16 +3,16 @@
 
 {% block content %}
     {% if study.exclusion_criteria %}
-        {{ study.exclusion_criteria|linebreaks }}
+        {{ study.exclusion_criteria|urlize|linebreaks }}
     {% endif %}
     {% for study_type in study.study_type.all %}
         {% if study_type.exclusion_criteria %}
             <h2>{{ study_type.label }}</h2>
-            {{ study_type.exclusion_criteria|linebreaks }}
+            {{ study_type.exclusion_criteria|urlize|linebreaks }}
         {% endif %}
     {% endfor %}
     {% if general_criteria %}
         <h2>{% translate 'General criteria' %}</h2>
-        {{ general_criteria|linebreaks }}
+        {{ general_criteria|urlize|linebreaks }}
     {% endif %}
 {% endblock %}
diff --git a/castellum/recruitment/templates/recruitment/contact.html b/castellum/recruitment/templates/recruitment/contact.html
index a84d9d6f0..72e2c3c1a 100644
--- a/castellum/recruitment/templates/recruitment/contact.html
+++ b/castellum/recruitment/templates/recruitment/contact.html
@@ -90,7 +90,7 @@
 
             <div class="tab-pane" id="study" role="tabpanel" aria-labelledby="study-tab">
                 {% if study.recruitment_text %}
-                    {{ study.recruitment_text|linebreaks }}</dd>
+                    {{ study.recruitment_text|urlize|linebreaks }}</dd>
                 {% endif %}
 
                 <dl class="row">
@@ -119,17 +119,17 @@
             {% if study.has_exclusion_criteria %}
                 <div class="tab-pane" id="criteria" role="tabpanel" aria-labelledby="criteria-tab">
                     {% if study.exclusion_criteria %}
-                        {{ study.exclusion_criteria|linebreaks }}
+                        {{ study.exclusion_criteria|urlize|linebreaks }}
                     {% endif %}
                     {% for study_type in study.study_type.all %}
                         {% if study_type.exclusion_criteria %}
                             <h2>{{ study_type.label }}</h2>
-                            {{ study_type.exclusion_criteria|linebreaks }}
+                            {{ study_type.exclusion_criteria|urlize|linebreaks }}
                         {% endif %}
                     {% endfor %}
                     {% if general_criteria %}
                         <h2>{% translate 'General criteria' %}</h2>
-                        {{ general_criteria|linebreaks }}
+                        {{ general_criteria|urlize|linebreaks }}
                     {% endif %}
 
                     {% bootstrap_field form.exclusion_criteria_checked %}
@@ -139,7 +139,7 @@
             {% if can_change_appointment %}
                 <div class="tab-pane" id="appointments" role="tabpanel" aria-labelledby="appointments-tab">
                     {% if study.session_instructions %}
-                        {{ study.session_instructions|linebreaks }}
+                        {{ study.session_instructions|urlize|linebreaks }}
                     {% endif %}
 
                     <dl class="row">
diff --git a/castellum/studies/templates/studies/study_detail.html b/castellum/studies/templates/studies/study_detail.html
index ef87dc909..484a5d4c2 100644
--- a/castellum/studies/templates/studies/study_detail.html
+++ b/castellum/studies/templates/studies/study_detail.html
@@ -80,5 +80,5 @@
     {% endif %}
 
     <h3 class="h5">{% translate "Description" %}</h3>
-    {{ study.description|default:'—'|linebreaks }}
+    {{ study.description|default:'—'|urlize|linebreaks }}
 {% endblock %}
diff --git a/castellum/studies/templates/studies/study_exclusioncriteria.html b/castellum/studies/templates/studies/study_exclusioncriteria.html
index 96ced5b81..b57eec556 100644
--- a/castellum/studies/templates/studies/study_exclusioncriteria.html
+++ b/castellum/studies/templates/studies/study_exclusioncriteria.html
@@ -14,7 +14,7 @@
             <details class="mb-3">
                 <summary class="mb-2">{% translate 'General criteria' %}</summary>
                 <blockquote class="blockquote">
-                    {{ general_criteria|linebreaks }}
+                    {{ general_criteria|urlize|linebreaks }}
                 </blockquote>
             </details>
         {% endif %}
@@ -24,7 +24,7 @@
                 <details class="mb-3">
                     <summary class="mb-2">{% translate 'Criteria for:' %} {{ study_type.label }}</summary>
                     <blockquote class="blockquote">
-                        {{ study_type.exclusion_criteria|linebreaks }}
+                        {{ study_type.exclusion_criteria|urlize|linebreaks }}
                     </blockquote>
                 </details>
             {% endif %}
-- 
GitLab