haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-02 15:38:15 +00:00
Code Issues Releases Wiki Activity

[share] fix

Browse Source
This commit is contained in:
llj
2016-08-15 17:21:42 +08:00
committed by lian
parent 5c59b81466
commit 1e0d94b694
3 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,7 +83,7 @@ define([
if (item_data.for_user) { if (item_data.for_user) {
$('#dir-user-share .error').html(err_msg).removeClass('hide'); $('#dir-user-share .error').html(err_msg).removeClass('hide');
} else { } else {
$('#dir-group-group .error').html(err_msg).removeClass('hide'); $('#dir-group-share .error').html(err_msg).removeClass('hide');
} }
} }
}); });
@@ -119,7 +119,7 @@ define([
if (item_data.for_user) { if (item_data.for_user) {
$('#dir-user-share .error').html(err_msg).removeClass('hide'); $('#dir-user-share .error').html(err_msg).removeClass('hide');
} else { } else {
$('#dir-group-group .error').html(err_msg).removeClass('hide'); $('#dir-group-share .error').html(err_msg).removeClass('hide');
} }
} }
}); });

4
static/scripts/app/views/share.js
View File

@@ -632,7 +632,7 @@ define([
var parsed_resp = $.parseJSON(xhr.responseText); var parsed_resp = $.parseJSON(xhr.responseText);
err_msg = parsed_resp.error||parsed_resp.error_msg; err_msg = parsed_resp.error||parsed_resp.error_msg;
} else { } else {
err_msg = gettext("Failed. Please check the network.") err_msg = gettext("Failed. Please check the network.");
} }
$error.html(err_msg).removeClass('hide'); $error.html(err_msg).removeClass('hide');
}, },
@@ -710,7 +710,7 @@ define([
var parsed_resp = $.parseJSON(xhr.responseText); var parsed_resp = $.parseJSON(xhr.responseText);
err_msg = parsed_resp.error||parsed_resp.error_msg; err_msg = parsed_resp.error||parsed_resp.error_msg;
} else { } else {
err_msg = gettext("Failed. Please check the network.") err_msg = gettext("Failed. Please check the network.");
} }
$error.html(err_msg).removeClass('hide'); $error.html(err_msg).removeClass('hide');
}, },

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

@@ -18,7 +18,7 @@ define([
this.render(); this.render();
this.$el.modal(); this.$el.modal({focus:false});
$('#simplemodal-container').css({'width':'auto', 'height':'auto'}); $('#simplemodal-container').css({'width':'auto', 'height':'auto'});
this.$("#share-tabs").tabs(); this.$("#share-tabs").tabs();
@@ -68,7 +68,7 @@ define([
'repo_id': repo_id, 'repo_id': repo_id,
'share_type': 'user' 'share_type': 'user'
}, },
'after_op_success': function (data) { 'after_op_success': function(data) {
$(data).each(function(index, item) { $(data).each(function(index, item) {
var new_item = new FolderShareItemView({ var new_item = new FolderShareItemView({
'repo_id': repo_id, 'repo_id': repo_id,
@@ -105,7 +105,7 @@ define([
'repo_id': repo_id, 'repo_id': repo_id,
'share_type': 'group' 'share_type': 'group'
}, },
'after_op_success': function (data) { 'after_op_success': function(data) {
$(data).each(function(index, item) { $(data).each(function(index, item) {
var new_item = new FolderShareItemView({ var new_item = new FolderShareItemView({
'repo_id': repo_id, 'repo_id': repo_id,
@@ -177,7 +177,7 @@ define([
if (data.failed.length > 0) { if (data.failed.length > 0) {
var err_msg = ''; var err_msg = '';
$(data.failed).each(function(index, item) { $(data.failed).each(function(index, item) {
err_msg += Common.HTMLescape(item.user_email) + ': ' + item.error_msg + '<br />'; err_msg += Common.HTMLescape(item.user_email) + ': ' + Common.HTMLescape(item.error_msg) + '<br />';
}); });
$error.html(err_msg).removeClass('hide'); $error.html(err_msg).removeClass('hide');
} }
@@ -185,9 +185,7 @@ define([
error: function(xhr) { error: function(xhr) {
var err_msg; var err_msg;
if (xhr.responseText) { if (xhr.responseText) {
var parsed_resp = $.parseJSON(xhr.responseText); err_msg = Common.HTMLescape($.parseJSON(xhr.responseText).error_msg);
err_msg = parsed_resp.error||parsed_resp.error_msg;
err_msg = Common.HTMLescape(err_msg);
} else { } else {
err_msg = gettext("Failed. Please check the network."); err_msg = gettext("Failed. Please check the network.");
} }
@@ -200,7 +198,6 @@ define([
}, },
dirGroupShare: function () { dirGroupShare: function () {
var $group_share_item= this.$('#add-dir-group-share-item'); var $group_share_item= this.$('#add-dir-group-share-item');
var $groups_input = $('[name="groups"]', $group_share_item), var $groups_input = $('[name="groups"]', $group_share_item),
@@ -253,7 +250,7 @@ define([
if (data.failed.length > 0) { if (data.failed.length > 0) {
var err_msg = ''; var err_msg = '';
$(data.failed).each(function(index, item) { $(data.failed).each(function(index, item) {
err_msg += Common.HTMLescape(item.group_id) + ': ' + item.error_msg + '<br />'; err_msg += Common.HTMLescape(item.group_id) + ': ' + Common.HTMLescape(item.error_msg) + '<br />';
}); });
$error.html(err_msg).removeClass('hide'); $error.html(err_msg).removeClass('hide');
} }
@@ -261,9 +258,7 @@ define([
error: function(xhr) { error: function(xhr) {
var err_msg; var err_msg;
if (xhr.responseText) { if (xhr.responseText) {
var parsed_resp = $.parseJSON(xhr.responseText); err_msg = Common.HTMLescape($.parseJSON(xhr.responseText).error_msg);
err_msg = parsed_resp.error||parsed_resp.error_msg;
err_msg = Common.HTMLescape(err_msg);
} else { } else {
err_msg = gettext("Failed. Please check the network."); err_msg = gettext("Failed. Please check the network.");
} }