From 069f1bcee924a389178f4f06b87077eecc4151bd Mon Sep 17 00:00:00 2001
From: Ramon Bartl <rb@ridingbytes.com>
Date: Thu, 15 Aug 2019 21:12:52 +0200
Subject: [PATCH 1/2] Render potentially HTML in Popup as `structure`

---
 bika/lims/browser/templates/analysisreport_info.pt  | 4 ++--
 bika/lims/browser/templates/analysisservice_info.pt | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bika/lims/browser/templates/analysisreport_info.pt b/bika/lims/browser/templates/analysisreport_info.pt
index d9f1eb62ee..7d88edf0c2 100644
--- a/bika/lims/browser/templates/analysisreport_info.pt
+++ b/bika/lims/browser/templates/analysisreport_info.pt
@@ -164,7 +164,7 @@
                       <span i18n:translate="">Subject</span>
                     </td>
                     <td>
-                      <span tal:content="record/email_subject|default">-</span>
+                      <span tal:content="structure record/email_subject|default">-</span>
                     </td>
                   </tr>
                   <!-- Body Text -->
@@ -173,7 +173,7 @@
                       <span i18n:translate="">Text</span>
                     </td>
                     <td>
-                      <pre class="small" tal:content="record/email_body|default">-</pre>
+                      <pre class="small" tal:content="structure record/email_body|default">-</pre>
                     </td>
                   </tr>
                   <!-- Attachments -->
diff --git a/bika/lims/browser/templates/analysisservice_info.pt b/bika/lims/browser/templates/analysisservice_info.pt
index bc9fcdf853..d6438a7d9a 100644
--- a/bika/lims/browser/templates/analysisservice_info.pt
+++ b/bika/lims/browser/templates/analysisservice_info.pt
@@ -51,7 +51,7 @@
                   <span i18n:translate="">Description</span>
                 </td>
                 <td>
-                  <span tal:content="service/Description"></span>
+                  <span tal:content="structure service/Description"></span>
                 </td>
               </tr>
               <tr>
@@ -134,7 +134,7 @@
                      tal:content="method/Title"/>
                 </td>
                 <td>
-                  <span tal:content="method/Description"></span>
+                  <span tal:content="structure method/Description"></span>
                 </td>
               </tr>
             </table>

From 97a614112e53a47acc296afe7c4a572f6bf9c72e Mon Sep 17 00:00:00 2001
From: Ramon Bartl <rb@ridingbytes.com>
Date: Thu, 15 Aug 2019 21:16:39 +0200
Subject: [PATCH 2/2] Changlog updated

---
 CHANGES.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 4b1934be4e..ca2b87fb4d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -22,6 +22,7 @@ Changelog
 
 **Fixed**
 
+- #1426 Render HTML Texts in Info Popups correctly
 - #1425 Fix adapter priority for widget visibility
 - #1421 Fix Search Query for Batches Listing
 - #1418 Subscriber adapters not supported in clients listing