haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-16 23:29:49 +00:00
Code Issues Releases Wiki Activity

[ajax] fixup for error msg (#2183)

Browse Source
This commit is contained in:
llj
2018-07-31 18:15:44 +08:00
committed by zheng xie
parent 9733d50a1a
commit 151857e92d
93 changed files with 287 additions and 1229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
static/scripts/app/views/dir.js
View File

@@ -470,7 +470,7 @@ define([
_this._showLibDecryptDialog();
return;
} else {
err_msg = response.responseJSON.error;
err_msg = Common.HTMLescape(response.responseJSON.error);
}
} else {
err_msg = gettext('Please check the network.');
@@ -503,13 +503,8 @@ define([
_this.reset();
},
error: function(xhr) {
var err_msg;
if (xhr.responseText) {
err_msg = JSON.parse(xhr.responseText).error_msg;
} else {
err_msg = gettext("Please check the network.");
}
_this.$error.html(err_msg).show();
var error_msg = Common.prepareAjaxErrorMsg(xhr);
_this.$error.html(error_msg).show();
}
});
},
@@ -1325,13 +1320,8 @@ define([
}
},
error: function(xhr, textStatus, errorThrown) {
var error;
if (xhr.responseText) {
error = JSON.parse(xhr.responseText).error;
} else {
error = gettext("Failed. Please check the network.");
}
cancel_btn.after('<p class="error">' + error + '</p>');
var error_msg = Common.prepareAjaxErrorMsg(xhr);
cancel_btn.after('<p class="error">' + error_msg + '</p>');
end();
}
});
@@ -1359,16 +1349,11 @@ define([
data: post_data,
success: after_op_success,
error: function(xhr) {
var err;
if (xhr.responseText) {
err = JSON.parse(xhr.responseText).error||JSON.parse(xhr.responseText).error_msg;
} else {
err = gettext("Failed. Please check the network.");
}
var error_msg = Common.prepareAjaxErrorMsg(xhr);
if (form.is(':visible')) {
$('.error', form).html(err).show();
$('.error', form).html(error_msg).show();
} else {
cancel_btn.after('<p class="error">' + err + '</p>');
cancel_btn.after('<p class="error">' + error_msg + '</p>');
cancel_btn.hide();
}
}
@@ -1428,13 +1413,8 @@ define([
end();
},
error: function(xhr, textStatus, errorThrown) {
var error;
if (xhr.responseText) {
error = JSON.parse(xhr.responseText).error;
} else {
error = gettext("Failed. Please check the network.");
}
other_info.html(error).removeClass('hide');
var error_msg = Common.prepareAjaxErrorMsg(xhr);
other_info.html(error_msg).removeClass('hide');
Common.enableButton(cancel_btn);
}
});