Browse Source

Merge pull request #11193 from abpframework/liangshiwei/js

Enhance handleAbpErrorResponse
pull/11209/head
maliming 5 years ago
committed by GitHub
parent
commit
94df826099
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      npm/packs/jquery/src/abp.jquery.js

10
npm/packs/jquery/src/abp.jquery.js

@ -205,14 +205,16 @@ var abp = abp || {};
handleAbpErrorResponse: function (jqXHR, userOptions, $dfd) { handleAbpErrorResponse: function (jqXHR, userOptions, $dfd) {
var messagePromise = null; var messagePromise = null;
var responseJSON = jqXHR.responseJSON ? jqXHR.responseJSON : JSON.parse(jqXHR.responseText);
if (userOptions.abpHandleError !== false) { if (userOptions.abpHandleError !== false) {
messagePromise = abp.ajax.showError(jqXHR.responseJSON.error); messagePromise = abp.ajax.showError(responseJSON.error);
} }
abp.ajax.logError(jqXHR.responseJSON.error); abp.ajax.logError(responseJSON.error);
$dfd && $dfd.reject(jqXHR.responseJSON.error, jqXHR); $dfd && $dfd.reject(responseJSON.error, jqXHR);
userOptions.error && userOptions.error(jqXHR.responseJSON.error, jqXHR); userOptions.error && userOptions.error(responseJSON.error, jqXHR);
if (jqXHR.status === 401 && userOptions.abpHandleError !== false) { if (jqXHR.status === 401 && userOptions.abpHandleError !== false) {
abp.ajax.handleUnAuthorizedRequest(messagePromise); abp.ajax.handleUnAuthorizedRequest(messagePromise);

Loading…
Cancel
Save