Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Render HTML Texts in Info Popups correctly #1426

Merged
merged 3 commits into from
Aug 15, 2019
Merged

Render HTML Texts in Info Popups correctly #1426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
069f1bc
Render potentially HTML in Popup as `structure`
ramonski Aug 15, 2019
97a6141
Changlog updated
ramonski Aug 15, 2019
1a1534a
Merge branch 'master' into render-structure-in-popups
ramonski Aug 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Changelog

**Fixed**

- #1426 Render HTML Texts in Info Popups correctly
- #1423 Use the value set for ui_item property when displaying ReferenceWidget
- #1425 Fix adapter priority for widget visibility
- #1421 Fix Search Query for Batches Listing
Expand Down
4 changes: 2 additions & 2 deletions bika/lims/browser/templates/analysisreport_info.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand All @@ -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 -->
Expand Down
4 changes: 2 additions & 2 deletions bika/lims/browser/templates/analysisservice_info.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down