haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-08 18:30:53 +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

9
static/scripts/sysadmin-app/views/address-book-group-item.js
View File

@@ -97,13 +97,8 @@ define([
$.modal.close();
},
error: function(xhr) {
var err_msg;
if (xhr.responseText) {
err_msg = $.parseJSON(xhr.responseText).error_msg;
} else {
err_msg = gettext("Failed. Please check the network.");
}
$error.html(err_msg).show();
var error_msg = Common.prepareAjaxErrorMsg(xhr);
$error.html(error_msg).show();
Common.enableButton($submitBtn);
}
});

53
static/scripts/sysadmin-app/views/address-book-group.js
View File

@@ -136,13 +136,8 @@ define([
Common.closeModal();
},
error: function(xhr) {
var err_msg;
if (xhr.responseText) {
err_msg = xhr.responseJSON.error_msg;
} else {
err_msg = gettext('Please check the network.');
}
$error.html(err_msg).show();
var error_msg = Common.prepareAjaxErrorMsg(xhr);
$error.html(error_msg).show();
Common.enableButton($submitBtn);
}
});
@@ -205,14 +200,9 @@ define([
}
},
error: function(jqXHR, textStatus, errorThrown){
var err_msg;
if (jqXHR.responseText) {
err_msg = jqXHR.responseJSON.error_msg;
} else {
err_msg = gettext('Please check the network.');
}
$error.html(err_msg).show();
error: function(xhr, textStatus, errorThrown){
var error_msg = Common.prepareAjaxErrorMsg(xhr);
$error.html(error_msg).show();
Common.enableButton($submitBtn);
}
});
@@ -259,14 +249,9 @@ define([
}
Common.closeModal();
},
error: function(jqXHR, textStatus, errorThrown){
var err_msg;
if (jqXHR.responseText) {
err_msg = jqXHR.responseJSON.error_msg;
} else {
err_msg = gettext('Please check the network.');
}
$error.html(err_msg).show();
error: function(xhr, textStatus, errorThrown){
var error_msg = Common.prepareAjaxErrorMsg(xhr);
$error.html(error_msg).show();
Common.enableButton($submitBtn);
}
});
@@ -301,16 +286,7 @@ define([
_this.getLibs();
},
error: function(collection, response, opts) {
var err_msg;
if (response.responseText) {
if (response['status'] == 401 || response['status'] == 403) {
err_msg = gettext("Permission error");
} else {
err_msg = $.parseJSON(response.responseText).error_msg;
}
} else {
err_msg = gettext("Failed. Please check the network.");
}
var err_msg = Common.prepareCollectionFetchErrorMsg(collection, response, opts);
_this.$error.html(err_msg).show();
},
complete:function() {
@@ -326,16 +302,7 @@ define([
cache: false,
reset: true,
error: function(collection, response, opts) {
var err_msg;
if (response.responseText) {
if (response['status'] == 401 || response['status'] == 403) {
err_msg = gettext("Permission error");
} else {
err_msg = $.parseJSON(response.responseText).error_msg;
}
} else {
err_msg = gettext("Failed. Please check the network.");
}
var err_msg = Common.prepareCollectionFetchErrorMsg(collection, response, opts);
_this.$error.html(err_msg).show();
}
});

20
static/scripts/sysadmin-app/views/address-book.js
View File

@@ -82,13 +82,8 @@ define([
Common.closeModal();
},
error: function(collection, response, options) {
var err_msg;
if (response.responseText) {
err_msg = response.responseJSON.error_msg;
} else {
err_msg = gettext('Please check the network.');
}
$error.html(err_msg).show();
var error_msg = Common.prepareAjaxErrorMsg(response);
$error.html(error_msg).show();
Common.enableButton($submitBtn);
}
});
@@ -118,16 +113,7 @@ define([
cache: false,
reset: true,
error: function(collection, response, opts) {
var err_msg;
if (response.responseText) {
if (response['status'] == 401 || response['status'] == 403) {
err_msg = gettext("Permission error");
} else {
err_msg = $.parseJSON(response.responseText).error_msg;
}
} else {
err_msg = gettext("Failed. Please check the network.");
}
var err_msg = Common.prepareCollectionFetchErrorMsg(collection, response, opts);
_this.$error.html(err_msg).show();
},
complete:function() {

11
static/scripts/sysadmin-app/views/admin-login-logs.js
View File

@@ -118,16 +118,7 @@ define([
cache: false,
reset: true,
error: function(collection, response, opts) {
var err_msg;
if (response.responseText) {
if (response['status'] == 401 || response['status'] == 403) {
err_msg = gettext("Permission error");
} else {
err_msg = JSON.parse(response.responseText).error_msg;
}
} else {
err_msg = gettext("Failed. Please check the network.");
}
var err_msg = Common.prepareCollectionFetchErrorMsg(collection, response, opts);
Common.feedback(err_msg, 'error');
},
complete: function() {

11
static/scripts/sysadmin-app/views/admin-operation-logs.js
View File

@@ -118,16 +118,7 @@ define([
cache: false,
reset: true,
error: function(collection, response, opts) {
var err_msg;
if (response.responseText) {
if (response['status'] == 401 || response['status'] == 403) {
err_msg = gettext("Permission error");
} else {
err_msg = JSON.parse(response.responseText).error_msg;
}
} else {
err_msg = gettext("Failed. Please check the network.");
}
var err_msg = Common.prepareCollectionFetchErrorMsg(collection, response, opts);
Common.feedback(err_msg, 'error');
},
complete: function() {

2
static/scripts/sysadmin-app/views/dashboard.js
View File

@@ -78,7 +78,7 @@ define([
if (response['status'] == 401 || response['status'] == 403) {
err_msg = gettext("Permission error");
} else {
err_msg = JSON.parse(response.responseText).error_msg;
err_msg = Common.HTMLescape(JSON.parse(response.responseText).error_msg);
}
} else {
err_msg = gettext("Failed. Please check the network.");

11
static/scripts/sysadmin-app/views/desktop-devices.js
View File

@@ -94,16 +94,7 @@ define([
cache: false, // for IE
reset: true,
error: function (collection, response, opts) {
var err_msg;
if (response.responseText) {
if (response['status'] == 401 || response['status'] == 403) {
err_msg = gettext("Permission error");
} else {
err_msg = JSON.parse(response.responseText).error_msg;
}
} else {
err_msg = gettext("Failed. Please check the network.");
}
var err_msg = Common.prepareCollectionFetchErrorMsg(collection, response, opts);
Common.feedback(err_msg, 'error');
}
});

11
static/scripts/sysadmin-app/views/device-errors.js
View File

@@ -81,16 +81,7 @@ define([
success: function (collection, response, opts) {
},
error: function (collection, response, opts) {
var err_msg;
if (response.responseText) {
if (response['status'] == 401 || response['status'] == 403) {
err_msg = gettext("Permission error");
} else {
err_msg = JSON.parse(response.responseText).error_msg;
}
} else {
err_msg = gettext("Failed. Please check the network.");
}
var err_msg = Common.prepareCollectionFetchErrorMsg(collection, response, opts);
Common.feedback(err_msg, 'error');
}
});

14
static/scripts/sysadmin-app/views/device-trusted-ipaddresses.js
View File

@@ -55,12 +55,7 @@ define([
Common.closeModal();
},
error: function(collection, response, options) {
var err_msg;
if (response.responseText) {
err_msg = JSON.parse(response.responseText).error_msg;
} else {
err_msg = gettext('Please check the network.');
}
var err_msg = Common.prepareCollectionFetchErrorMsg(collection, response, opts);
$error.html(err_msg).show();
Common.enableButton($submitBtn);
}
@@ -108,12 +103,7 @@ define([
cache: false,
reset: true,
error: function(collection, response, opts){
var err_msg;
if (response.responseText) {
err_msg = JSON.parse(response.responseText).error_msg;
} else {
err_msg = gettext("Failed. Please check the network.");
}
var err_msg = Common.prepareCollectionFetchErrorMsg(collection, response, opts);
Common.feedback(err_msg, 'error');
},
complete: function() {

11
static/scripts/sysadmin-app/views/dir.js
View File

@@ -184,16 +184,7 @@ define([
cache: false,
reset: true,
error: function(collection, response, opts) {
var err_msg;
if (response.responseText) {
if (response['status'] == 401 || response['status'] == 403) {
err_msg = gettext("Permission error");
} else {
err_msg = JSON.parse(response.responseText).error_msg;
}
} else {
err_msg = gettext("Failed. Please check the network.");
}
var err_msg = Common.prepareCollectionFetchErrorMsg(collection, response, opts);
Common.feedback(err_msg, 'error');
}
});

26
static/scripts/sysadmin-app/views/folder-share-item.js
View File

@@ -81,18 +81,11 @@ define([
_this.render();
},
error: function(xhr) {
var err_msg;
if (xhr.responseText) {
var parsed_resp = JSON.parse(xhr.responseText);
err_msg = parsed_resp.error||parsed_resp.error_msg;
err_msg = Common.HTMLescape(err_msg);
} else {
err_msg = gettext("Failed. Please check the network.");
}
var error_msg = Common.prepareAjaxErrorMsg(xhr);
if (item_data.for_user) {
$('#dir-user-share .error').html(err_msg).removeClass('hide');
$('#dir-user-share .error').html(error_msg).removeClass('hide');
} else {
$('#dir-group-share .error').html(err_msg).removeClass('hide');
$('#dir-group-share .error').html(error_msg).removeClass('hide');
}
}
});
@@ -130,18 +123,11 @@ define([
_this.remove();
},
error: function (xhr) {
var err_msg;
if (xhr.responseText) {
var parsed_resp = JSON.parse(xhr.responseText);
err_msg = parsed_resp.error||parsed_resp.error_msg;
err_msg = Common.HTMLescape(err_msg);
} else {
err_msg = gettext("Failed. Please check the network.");
}
var error_msg = Common.prepareAjaxErrorMsg(xhr);
if (item_data.for_user) {
$('#dir-user-share .error').html(err_msg).removeClass('hide');
$('#dir-user-share .error').html(error_msg).removeClass('hide');
} else {
$('#dir-group-share .error').html(err_msg).removeClass('hide');
$('#dir-group-share .error').html(error_msg).removeClass('hide');
}
}
});

9
static/scripts/sysadmin-app/views/group-member.js
View File

@@ -64,13 +64,8 @@ define([
});
},
error: function(xhr) {
var err_msg;
if (xhr.responseText) {
err_msg = JSON.parse(xhr.responseText).error_msg;
} else {
err_msg = gettext("Failed. Please check the network.");
}
Common.feedback(err_msg, 'error');
var error_msg = Common.prepareAjaxErrorMsg(xhr);
Common.feedback(error_msg, 'error');
}
});
},

22
static/scripts/sysadmin-app/views/group-members.js
View File

@@ -80,14 +80,9 @@ define([
}
},
error: function(jqXHR, textStatus, errorThrown){
var err_msg;
if (jqXHR.responseText) {
err_msg = jqXHR.responseJSON.error_msg;
} else {
err_msg = gettext('Please check the network.');
}
$error.html(err_msg).show();
error: function(xhr, textStatus, errorThrown){
var error_msg = Common.prepareAjaxErrorMsg(xhr);
$error.html(error_msg).show();
Common.enableButton($submitBtn);
}
});
@@ -138,16 +133,7 @@ define([
cache: false,
reset: true,
error: function(collection, response, opts) {
var err_msg;
if (response.responseText) {
if (response['status'] == 401 || response['status'] == 403) {
err_msg = gettext("Permission error");
} else {
err_msg = JSON.parse(response.responseText).error_msg;
}
} else {
err_msg = gettext("Failed. Please check the network.");
}
var err_msg = Common.prepareCollectionFetchErrorMsg(collection, response, opts);
Common.feedback(err_msg, 'error');
}
});

11
static/scripts/sysadmin-app/views/group-repos.js
View File

@@ -64,16 +64,7 @@ define([
cache: false,
reset: true,
error: function(collection, response, opts) {
var err_msg;
if (response.responseText) {
if (response['status'] == 401 || response['status'] == 403) {
err_msg = gettext("Permission error");
} else {
err_msg = JSON.parse(response.responseText).error_msg;
}
} else {
err_msg = gettext("Failed. Please check the network.");
}
var err_msg = Common.prepareCollectionFetchErrorMsg(collection, response, opts);
Common.feedback(err_msg, 'error');
}
});

7
static/scripts/sysadmin-app/views/group.js
View File

@@ -100,12 +100,7 @@ define([
Common.feedback(gettext("Successfully transferred the group."), 'success');
},
error: function(xhr) {
var error_msg;
if (xhr.responseText) {
error_msg = JSON.parse(xhr.responseText).error_msg;
} else {
error_msg = gettext("Failed. Please check the network.");
}
var error_msg = Common.prepareAjaxErrorMsg(xhr);
$('.error', $form).html(error_msg).show();
Common.enableButton($submitBtn);
}

18
static/scripts/sysadmin-app/views/groups.js
View File

@@ -94,12 +94,7 @@ define([
Common.closeModal();
},
error: function(collection, response, options) {
var err_msg;
if (response.responseText) {
err_msg = response.responseJSON.error_msg;
} else {
err_msg = gettext('Please check the network.');
}
var err_msg = Common.prepareCollectionFetchErrorMsg(collection, response, opts);
$error.html(err_msg).show();
Common.enableButton($submitBtn);
}
@@ -158,16 +153,7 @@ define([
cache: false,
reset: true,
error: function(collection, response, opts) {
var err_msg;
if (response.responseText) {
if (response['status'] == 401 || response['status'] == 403) {
err_msg = gettext("Permission error");
} else {
err_msg = JSON.parse(response.responseText).error_msg;
}
} else {
err_msg = gettext("Failed. Please check the network.");
}
var err_msg = Common.prepareCollectionFetchErrorMsg(collection, response, opts);
_this.$error.html(err_msg).show();
},
complete:function() {

11
static/scripts/sysadmin-app/views/mobile-devices.js
View File

@@ -95,16 +95,7 @@ define([
cache: false, // for IE
reset: true,
error: function (collection, response, opts) {
var err_msg;
if (response.responseText) {
if (response['status'] == 401 || response['status'] == 403) {
err_msg = gettext("Permission error");
} else {
err_msg = JSON.parse(response.responseText).error_msg;
}
} else {
err_msg = gettext("Failed. Please check the network.");
}
var err_msg = Common.prepareCollectionFetchErrorMsg(collection, response, opts);
Common.feedback(err_msg, 'error');
}
});

7
static/scripts/sysadmin-app/views/repo.js
View File

@@ -135,12 +135,7 @@ define([
Common.feedback(gettext("Successfully transferred the library."), 'success');
},
error: function(xhr) {
var error_msg;
if (xhr.responseText) {
error_msg = JSON.parse(xhr.responseText).error_msg;
} else {
error_msg = gettext("Failed. Please check the network.");
}
var error_msg = Common.prepareAjaxErrorMsg(xhr);
$('.error', $form).html(error_msg).show();
Common.enableButton($submitBtn);
}

20
static/scripts/sysadmin-app/views/repos.js
View File

@@ -84,13 +84,8 @@ define([
Common.closeModal();
},
error: function(collection, response, options) {
var err_msg;
if (response.responseText) {
err_msg = response.responseJSON.error_msg;
} else {
err_msg = gettext('Please check the network.');
}
$error.html(err_msg).show();
var error_msg = Common.prepareAjaxErrorMsg(response);
$error.html(error_msg).show();
Common.enableButton($submitBtn);
}
});
@@ -153,16 +148,7 @@ define([
cache: false,
reset: true,
error: function(collection, response, opts) {
var err_msg;
if (response.responseText) {
if (response['status'] == 401 || response['status'] == 403) {
err_msg = gettext("Permission error");
} else {
err_msg = JSON.parse(response.responseText).error_msg;
}
} else {
err_msg = gettext("Failed. Please check the network.");
}
var err_msg = Common.prepareCollectionFetchErrorMsg(collection, response, opts);
Common.feedback(err_msg, 'error');
},
complete:function() {

11
static/scripts/sysadmin-app/views/search-groups.js
View File

@@ -65,16 +65,7 @@ define([
cache: false,
reset: true,
error: function(collection, response, opts) {
var err_msg;
if (response.responseText) {
if (response['status'] == 401 || response['status'] == 403) {
err_msg = gettext("Permission error");
} else {
err_msg = JSON.parse(response.responseText).error_msg;
}
} else {
err_msg = gettext("Failed. Please check the network.");
}
var err_msg = Common.prepareCollectionFetchErrorMsg(collection, response, opts);
Common.feedback(err_msg, 'error');
},
complete:function() {

11
static/scripts/sysadmin-app/views/search-repos.js
View File

@@ -66,16 +66,7 @@ define([
cache: false,
reset: true,
error: function(collection, response, opts) {
var err_msg;
if (response.responseText) {
if (response['status'] == 401 || response['status'] == 403) {
err_msg = gettext("Permission error");
} else {
err_msg = JSON.parse(response.responseText).error_msg;
}
} else {
err_msg = gettext("Failed. Please check the network.");
}
var err_msg = Common.prepareCollectionFetchErrorMsg(collection, response, opts);
Common.feedback(err_msg, 'error');
},
complete:function() {

11
static/scripts/sysadmin-app/views/search-trash-repos.js
View File

@@ -102,16 +102,7 @@ define([
cache: false,
reset: true,
error: function(collection, response, opts) {
var err_msg;
if (response.responseText) {
if (response['status'] == 401 || response['status'] == 403) {
err_msg = gettext("Permission error");
} else {
err_msg = JSON.parse(response.responseText).error_msg;
}
} else {
err_msg = gettext("Failed. Please check the network.");
}
var err_msg = Common.prepareCollectionFetchErrorMsg(collection, response, opts);
Common.feedback(err_msg, 'error');
},
complete: function() {

16
static/scripts/sysadmin-app/views/share.js
View File

@@ -194,13 +194,8 @@ define([
}
},
error: function(xhr) {
var err_msg;
if (xhr.responseText) {
err_msg = Common.HTMLescape(JSON.parse(xhr.responseText).error_msg);
} else {
err_msg = gettext("Failed. Please check the network.");
}
$error.html(err_msg).removeClass('hide');
var error_msg = Common.prepareAjaxErrorMsg(xhr);
$error.html(error_msg).removeClass('hide');
},
complete: function() {
Common.enableButton($submitBtn);
@@ -268,12 +263,7 @@ define([
}
},
error: function(xhr) {
var err_msg;
if (xhr.responseText) {
err_msg = Common.HTMLescape(JSON.parse(xhr.responseText).error_msg);
} else {
err_msg = gettext("Failed. Please check the network.");
}
var error_msg = Common.prepareAjaxErrorMsg(xhr);
$error.html(err_msg).removeClass('hide');
},
complete: function() {

11
static/scripts/sysadmin-app/views/system-repo.js
View File

@@ -48,16 +48,7 @@ define([
_this.reset();
},
error: function(model, response, options) {
var err_msg;
if (response.responseText) {
if (response['status'] == 401 || response['status'] == 403) {
err_msg = gettext("Permission error");
} else {
err_msg = JSON.parse(response.responseText).error_msg;
}
} else {
err_msg = gettext("Failed. Please check the network.");
}
var err_msg = Common.prepareCollectionFetchErrorMsg(collection, response, opts);
Common.feedback(err_msg, 'error');
}
});

11
static/scripts/sysadmin-app/views/trash-repos.js
View File

@@ -131,16 +131,7 @@ define([
cache: false,
reset: true,
error: function(collection, response, opts) {
var err_msg;
if (response.responseText) {
if (response['status'] == 401 || response['status'] == 403) {
err_msg = gettext("Permission error");
} else {
err_msg = JSON.parse(response.responseText).error_msg;
}
} else {
err_msg = gettext("Failed. Please check the network.");
}
var err_msg = Common.prepareCollectionFetchErrorMsg(collection, response, opts);
Common.feedback(err_msg, 'error');
}
});