Skip to content

Commit 8f8945d

Browse files
authored
Issue#3064 html alert title message (#3065)
Fixes [#3064](#3064) - Fixes default alert module nunjucks templates to render HTML by default unless 'titleType' and 'messageType' are set to 'text' in the payload data e.g. Display Text: `this.sendNotification('SHOW_ALERT', {type: "notification", title: "<u>YoLink LeakSensor</u>", titleType: "text", message: "<b>" + deviceName + "</b> reported an alarm that needs attention.", messageType: "text"});` Display HTML: `this.sendNotification('SHOW_ALERT', {type: "notification", title: "<u>YoLink LeakSensor</u>", message: "<b>" + deviceName + "</b> reported an alarm that needs attention."});`
1 parent 6d77923 commit 8f8945d

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ _This release is scheduled to be released on 2023-04-01._
5555
- Fix wrong vertical alignment of calendar title column when wrapEvents is true (#3053)
5656
- Fix empty news feed stopping the reload forever
5757
- Fix e2e tests (failed after async changes) by running calendar and newsfeed tests last
58+
- Fix default alert module to render HTML for title and message
5859

5960
## [2.22.0] - 2023-01-01
6061

modules/default/alert/templates/alert.njk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
<br/>
99
{% endif %}
1010
{% if title %}
11-
<span class="thin dimmed medium">{{ title }}</span>
11+
<span class="thin dimmed medium">{{ title if titleType == 'text' else title | safe }}</span>
1212
{% endif %}
1313
{% if message %}
1414
{% if title %}
1515
<br/>
1616
{% endif %}
17-
<span class="light bright small">{{ message | safe }}</span>
17+
<span class="light bright small">{{ message if messageType == 'text' else message | safe }}</span>
1818
{% endif %}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{% if title %}
2-
<span class="thin dimmed medium">{{ title }}</span>
2+
<span class="thin dimmed medium">{{ title if titleType == 'text' else title | safe }}</span>
33
{% endif %}
44
{% if message %}
55
{% if title %}
66
<br/>
77
{% endif %}
8-
<span class="light bright small">{{ message | safe }}</span>
8+
<span class="light bright small">{{ message if messageType == 'text' else message | safe }}</span>
99
{% endif %}

0 commit comments

Comments
 (0)