File tree Expand file tree Collapse file tree 4 files changed +34
-24
lines changed
app/code/Magento/Ui/view/base/web Expand file tree Collapse file tree 4 files changed +34
-24
lines changed Original file line number Diff line number Diff line change @@ -29,15 +29,19 @@ define([
29
29
success : function ( resp ) {
30
30
if ( ! resp . error ) {
31
31
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 ;
40
33
}
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
+ } ) ;
41
45
} ,
42
46
complete : function ( ) {
43
47
$ ( 'body' ) . trigger ( 'processStop' ) ;
Original file line number Diff line number Diff line change 5
5
*/
6
6
-->
7
7
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 } ">
15
15
< strong class ="title ">
16
16
< span data-bind ="text: label "> </ span >
17
17
</ strong >
18
18
</ div >
19
19
< div class ="admin__fieldset-wrapper-content " data-bind ="visible: opened ">
20
- < div class ="messages "> </ div >
21
20
< fieldset class ="admin__fieldset ">
22
- <!-- ko foreach: { data: elems, as: 'element' } -->
21
+ <!-- ko foreach: { data: elems, as: 'element' } -->
23
22
<!-- ko template: element.getTemplate() --> <!-- /ko -->
24
- <!-- /ko -->
23
+ <!-- /ko -->
25
24
</ fieldset >
26
25
</ div >
27
26
</ div >
Original file line number Diff line number Diff line change @@ -13,8 +13,8 @@ define([
13
13
$ . widget ( 'mage.notification' , {
14
14
options : {
15
15
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>'
18
18
}
19
19
} ,
20
20
@@ -52,16 +52,20 @@ define([
52
52
var message = mageTemplate ( template , {
53
53
data : data
54
54
} ) ;
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
+ }
57
61
return this ;
58
62
} ,
59
63
60
64
/**
61
65
* Removes error messages.
62
66
*/
63
67
clear : function ( ) {
64
- $ ( '. messages' ) . html ( '' ) ;
68
+ $ ( '# messages' ) . html ( '' ) ;
65
69
}
66
70
} ) ;
67
71
Original file line number Diff line number Diff line change 148
148
$ ( 'body' ) . notification ( 'clear' )
149
149
. notification ( 'add' , {
150
150
error : data . error ,
151
- message : data . message
151
+ message : data . message ,
152
+ insertMethod : function ( message ) {
153
+ $ ( '.messages:first' ) . html ( message ) ;
154
+ }
152
155
} ) ;
153
156
} ,
154
157
You can’t perform that action at this time.
0 commit comments