Skip to content

Commit deb001c

Browse files
committed
#1684: Login failed error contains HTML tags - added a function to format messages to render as HTML
1 parent d76acc2 commit deb001c

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/messages.js

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,17 @@
44
*/
55

66
define([
7-
'uiElement'
8-
], function (Element) {
7+
'uiElement',
8+
'escaper'
9+
], function (Element, escaper) {
910
'use strict';
1011

1112
return Element.extend({
1213
defaults: {
1314
template: 'Magento_MediaGalleryUi/grid/messages',
1415
messageDelay: 5,
15-
messages: []
16+
messages: [],
17+
allowedTags: ['div', 'span', 'b', 'strong', 'i', 'em', 'u', 'a']
1618
},
1719

1820
/**
@@ -72,6 +74,16 @@ define([
7274
clearTimeout(timerId);
7375
this.clear();
7476
}.bind(this), Number(delay) * 1000);
77+
},
78+
79+
/**
80+
* Prepare the given message to be rendered as HTML
81+
*
82+
* @param {String} message
83+
* @return {String}
84+
*/
85+
prepareMessageForHtml: function (message) {
86+
return escaper.escapeHtml(message, this.allowedTags);
7587
}
7688
});
7789
});

app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/messages.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<div class="messages" outereach="messages">
99
<div attr="class: 'message message-'+code">
1010
<div data-ui-id="messages-message-error">
11-
<span text="message"></span>
11+
<span data-bind="html: $parent.prepareMessageForHtml(message)"></span>
1212
</div>
1313
</div>
1414
</div>

0 commit comments

Comments
 (0)