Skip to content

Commit f20c44e

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

File tree

1 file changed

+11
-23
lines changed

1 file changed

+11
-23
lines changed

lib/web/mage/backend/bootstrap.js

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,17 @@ define([
99
'mage/apply/main',
1010
'Magento_Ui/js/lib/knockout/bootstrap',
1111
'mage/mage',
12-
'mage/translate'
12+
'mage/translate',
13+
'mage/backend/notification'
1314
], function ($, mage) {
1415
'use strict';
1516

17+
var errorMessages = {
18+
'error': $.mage.__('HTTP Error'),
19+
'abort': $.mage.__('The request was aborted by the server'),
20+
'timeout': $.mage.__('The request timed out'),
21+
'parsererror': $.mage.__('XML/Json format is bad')
22+
};
1623
var bootstrap;
1724

1825
$.ajaxSetup({
@@ -74,37 +81,18 @@ define([
7481
* Error callback.
7582
*/
7683
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-
9684
$('body').notification('clear')
9785
.notification('add', {
9886
error: true,
99-
message: message,
87+
message: errorMessages[status] + ' (' + jqXHR.status + ' ' + jqXHR.statusText + ')',
10088

10189
/**
10290
* @param {*} message
10391
*/
10492
insertMethod: function (message) {
105-
var $wrapper = $('<div/>').addClass(this.messagesClass).html(message);
93+
var $wrapper = $('<div/>').html(message);
10694

107-
$('.page-main-actions', this.selectorPrefix).after($wrapper);
95+
$('.page-main-actions').after($wrapper);
10896
}
10997
});
11098
}

0 commit comments

Comments
 (0)