Skip to content

Commit 135014b

Browse files
committed
MAGETWO-60982: AJAX calls does not process error responses
1 parent 65c52c0 commit 135014b

File tree

2 files changed

+43
-46
lines changed

2 files changed

+43
-46
lines changed

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

Lines changed: 2 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ define([
77
'jquery',
88
'underscore',
99
'mageUtils',
10-
'uiClass',
11-
'mage/translate'
12-
], function ($, _, utils, Class, $t) {
10+
'uiClass'
11+
], function ($, _, utils, Class) {
1312
'use strict';
1413

1514
/**
@@ -74,48 +73,6 @@ define([
7473
*/
7574
complete: function () {
7675
$('body').trigger('processStop');
77-
},
78-
79-
/**
80-
* Error callback.
81-
*/
82-
error: function (request, type, errorThrown) {
83-
var message;
84-
85-
switch (type) {
86-
case 'timeout':
87-
message = $t('The request timed out.');
88-
break;
89-
case 'notmodified':
90-
message = $t('The request was not modified but was not retrieved from the cache.');
91-
break;
92-
case 'parsererror':
93-
message = $t('XML/Json format is bad.');
94-
break;
95-
case 'abort':
96-
message = $t('The request was aborted by the server.');
97-
break;
98-
default:
99-
message = $t('HTTP Error') + ' (' + request.status + ' ' + request.statusText + ').';
100-
}
101-
102-
$('body').notification('clear');
103-
$('body').notification('add', {
104-
error: true,
105-
message: message,
106-
107-
/**
108-
* Insert method.
109-
*
110-
* @param {String} msg
111-
*/
112-
insertMethod: function (msg) {
113-
var $wrapper = $('<div/>').addClass(messagesClass).html(msg);
114-
115-
$('.page-main-actions', selectorPrefix).after($wrapper);
116-
}
117-
});
118-
11976
}
12077
});
12178

lib/web/mage/backend/bootstrap.js

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ define([
88
'jquery',
99
'mage/apply/main',
1010
'Magento_Ui/js/lib/knockout/bootstrap',
11-
'mage/mage'
11+
'mage/mage',
12+
'mage/translate'
1213
], function ($, mage) {
1314
'use strict';
1415

@@ -67,6 +68,45 @@ define([
6768
}
6869
} catch (e) {}
6970
}
71+
},
72+
73+
/**
74+
* Error callback.
75+
*/
76+
error: function (jqXHR, status, error) {
77+
var message;
78+
79+
switch (status) {
80+
case 'timeout':
81+
message = $.mage.__('The request timed out.');
82+
break;
83+
case 'notmodified':
84+
message = $.mage.__('The request was not modified but was not retrieved from the cache.');
85+
break;
86+
case 'parsererror':
87+
message = $.mage.__('XML/Json format is bad.');
88+
break;
89+
case 'abort':
90+
message = $.mage.__('The request was aborted by the server.');
91+
break;
92+
default:
93+
message = $.mage.__('HTTP Error') + ' (' + jqXHR.status + ' ' + jqXHR.statusText + ').';
94+
}
95+
96+
$('body').notification('clear')
97+
.notification('add', {
98+
error: true,
99+
message: message,
100+
101+
/**
102+
* @param {*} message
103+
*/
104+
insertMethod: function (message) {
105+
var $wrapper = $('<div/>').addClass(this.messagesClass).html(message);
106+
107+
$('.page-main-actions', this.selectorPrefix).after($wrapper);
108+
}
109+
});
70110
}
71111
});
72112

0 commit comments

Comments
 (0)