From 4ea154410ab95d0afce814ac233aca0656b1995c Mon Sep 17 00:00:00 2001
From: Mojca Lorber <mojca.lorber@biosistemika.com>
Date: Thu, 19 Jan 2017 15:27:24 +0100
Subject: [PATCH] add to fields with rich text formatting

---
 app/views/reports/elements/_result_text_element.html.erb | 3 ++-
 app/views/reports/elements/_step_element.html.erb        | 7 ++++---
 app/views/results/_result_text.html.erb                  | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/views/reports/elements/_result_text_element.html.erb b/app/views/reports/elements/_result_text_element.html.erb
index 01cdfd142..d00ecd335 100644
--- a/app/views/reports/elements/_result_text_element.html.erb
+++ b/app/views/reports/elements/_result_text_element.html.erb
@@ -23,8 +23,9 @@
   <div class="report-element-body">
     <div class="row">
       <div class="col-xs-12 text-container ql-editor">
-        <%= auto_link(result_text.text,
+        <%= auto_link(smart_annotation_parser(result_text.text),
                       link: :urls,
+                      sanitize: false,
                       html: { target: '_blank' }).html_safe %>
       </div>
     </div>
diff --git a/app/views/reports/elements/_step_element.html.erb b/app/views/reports/elements/_step_element.html.erb
index dcb23b72b..3ec41f850 100644
--- a/app/views/reports/elements/_step_element.html.erb
+++ b/app/views/reports/elements/_step_element.html.erb
@@ -27,9 +27,10 @@
     <div class="row">
       <div class="col-xs-12 ql-editor">
         <% if strip_tags(step.description).present? %>
-          <%= auto_link(step.description,
-                        link: :urls,
-                        html: { target: '_blank' }).html_safe %>
+          <%= auto_link(smart_annotation_parser(step.description),
+                              link: :urls,
+                              sanitize: false,
+                              html: { target: '_blank' }).html_safe %>
         <% else %>
            <em><%=t "projects.reports.elements.step.no_description" %></em>
         <% end %>
diff --git a/app/views/results/_result_text.html.erb b/app/views/results/_result_text.html.erb
index 7e6189a09..fabfb4621 100644
--- a/app/views/results/_result_text.html.erb
+++ b/app/views/results/_result_text.html.erb
@@ -1,5 +1,6 @@
 <div class="ql-editor">
   <%= auto_link(smart_annotation_parser(result.result_text.text),
                 link: :urls,
+                sanitize: false,
                 html: { target: '_blank' }).html_safe %>
 </div>