Skip to content

Commit b8f1ee7

Browse files
author
okarpenko
committed
MAGETWO-37818: Customer invalid email message is not displayed
1 parent 5d5394f commit b8f1ee7

File tree

4 files changed

+34
-24
lines changed

4 files changed

+34
-24
lines changed

app/code/Magento/Ui/view/base/web/js/form/client.js

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,19 @@ define([
2929
success: function (resp) {
3030
if (!resp.error) {
3131
save.resolve();
32-
} else {
33-
$('body').notification('clear');
34-
$.each(resp.messages, function(key, message) {
35-
$('body').notification('add', {
36-
error: resp.error,
37-
message: message
38-
});
39-
});
32+
return true;
4033
}
34+
35+
$('body').notification('clear');
36+
$.each(resp.messages, function(key, message) {
37+
$('body').notification('add', {
38+
error: resp.error,
39+
message: message,
40+
insertMethod: function(message) {
41+
$('.page-main-actions').after(message);
42+
}
43+
});
44+
});
4145
},
4246
complete: function () {
4347
$('body').trigger('processStop');

app/code/Magento/Ui/view/base/web/templates/form/fieldset.html

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,22 @@
55
*/
66
-->
77

8-
<div
9-
class="admin__fieldset-wrapper"
10-
data-bind="css: {'admin__collapsible-block-wrapper': collapsible, 'opened': opened}">
11-
<div
12-
class="admin__fieldset-wrapper-title"
13-
tabindex="3"
14-
data-bind="click: toggleOpened, keyboard: { 13: toggleOpened }">
8+
<div
9+
class="admin__fieldset-wrapper"
10+
data-bind="css: {'admin__collapsible-block-wrapper': collapsible, 'opened': opened}">
11+
<div
12+
class="admin__fieldset-wrapper-title"
13+
tabindex="3"
14+
data-bind="click: toggleOpened, keyboard: { 13: toggleOpened }">
1515
<strong class="title">
1616
<span data-bind="text: label"></span>
1717
</strong>
1818
</div>
1919
<div class="admin__fieldset-wrapper-content" data-bind="visible: opened">
20-
<div class="messages"></div>
2120
<fieldset class="admin__fieldset">
22-
<!-- ko foreach: { data: elems, as: 'element' } -->
21+
<!-- ko foreach: { data: elems, as: 'element' } -->
2322
<!-- ko template: element.getTemplate() --><!-- /ko -->
24-
<!-- /ko -->
23+
<!-- /ko -->
2524
</fieldset>
2625
</div>
2726
</div>

lib/web/mage/backend/notification.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ define([
1313
$.widget('mage.notification', {
1414
options: {
1515
templates: {
16-
global: '<div class="messages"><div class="message <% if (data.error) { %>error<% } %>"><div><%- data.message %></div></div></div>',
17-
error: '<div class="messages"><div class="message message-error error"><div data-ui-id="messages-message-error" ><%- data.message %></div></div></div>'
16+
global: '<div id="messages"><div class="message <% if (data.error) { %>error<% } %>"><div><%- data.message %></div></div></div>',
17+
error: '<div id="messages"><div class="messages"><div class="message message-error error"><div data-ui-id="messages-message-error"><%- data.message %></div></div></div></div>'
1818
}
1919
},
2020

@@ -52,16 +52,20 @@ define([
5252
var message = mageTemplate(template, {
5353
data: data
5454
});
55-
var messageContainer = data.messageContainer || '.messages:first';
56-
$(messageContainer).prepend(message);
55+
if (typeof data.insertMethod === 'function') {
56+
data.insertMethod(message);
57+
} else {
58+
var messageContainer = data.messageContainer || '#messages';
59+
$(messageContainer).prepend(message);
60+
}
5761
return this;
5862
},
5963

6064
/**
6165
* Removes error messages.
6266
*/
6367
clear: function () {
64-
$('.messages').html('');
68+
$('#messages').html('');
6569
}
6670
});
6771

lib/web/mage/backend/validation.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,10 @@
148148
$('body').notification('clear')
149149
.notification('add', {
150150
error: data.error,
151-
message: data.message
151+
message: data.message,
152+
insertMethod: function(message) {
153+
$('.messages:first').html(message);
154+
}
152155
});
153156
},
154157

0 commit comments

Comments
 (0)