1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-16 23:29:49 +00:00

add ENABLE_GUEST_INVITATION setting

This commit is contained in:
lian
2016-07-20 15:30:39 +08:00
parent e5b0d1ee31
commit 782fbb38ed
13 changed files with 56 additions and 25 deletions

View File

@@ -73,7 +73,7 @@ define([
error: function(collection, response, options) {
var err_msg;
if (response.responseText) {
err_msg = response.responseJSON.error_msg;
err_msg = response.responseJSON.error_msg||response.responseJSON.detail;
} else {
err_msg = gettext('Please check the network.');
}

View File

@@ -349,7 +349,7 @@ define([
ajaxErrorHandler: function(xhr, textStatus, errorThrown) {
if (xhr.responseText) {
var parsed_resp = $.parseJSON(xhr.responseText);
this.feedback(parsed_resp.error||parsed_resp.error_msg, 'error');
this.feedback(parsed_resp.error||parsed_resp.error_msg||parsed_resp.detail, 'error');
} else {
this.feedback(gettext("Failed. Please check the network."), 'error');
}