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

[dir shared items] modified 'perm edit', bugfix & add 'error handle' for 'list/add/delete', clean up code

Browse Source
This commit is contained in:
llj
2015-07-02 15:44:50 +08:00
committed by zhengxie
parent 7d6b84ecc5
commit 69101f41f6
6 changed files with 58 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,39 +49,39 @@ define([
editPerm: function (e) {
var _this = this;
var item_data = this.item_data;
var for_user = item_data.for_user;
var share_type = for_user ? 'personal' : 'group';
var url = Common.getUrl({
name: 'dir_shared_items',
repo_id: this.repo_id
}) + '?p=' + encodeURIComponent(this.path);
if (item_data.for_user) {
url += '&share_type=user&username=' + encodeURIComponent(item_data.user);
} else {
url += '&share_type=group&group_id=' + encodeURIComponent(item_data.group_id);
}
var perm = $(e.currentTarget).val();
var post_data = {
repo_id: this.repo_id,
email_or_group: for_user ? item_data.user : item_data.group_id,
permission: perm
};
$.ajax({
url: Common.getUrl({
name: 'share_permission_admin'
}) + '?share_type=' + share_type,
type: 'POST',
url: url,
dataType: 'json',
cache: false,
method: 'POST',
beforeSend: Common.prepareCSRFToken,
data: post_data,
success: function() {
data: {
'permission': perm
},
success: function () {
item_data.perm = perm;
_this.render();
},
error: function(xhr) {
var err;
var err_msg;
if (xhr.responseText) {
err = $.parseJSON(xhr.responseText).error;
err_msg = gettext("Edit failed");
} else {
err = gettext("Failed. Please check the network.");
err_msg = gettext("Failed. Please check the network.");
}
if (share_type == 'personal') {
$('#dir-user-share .error').html(err).removeClass('hide');
if (item_data.for_user) {
$('#dir-user-share .error').html(err_msg).removeClass('hide');
} else {
$('#dir-group-group .error').html(err).removeClass('hide');
$('#dir-group-group .error').html(err_msg).removeClass('hide');
}
}
});
@@ -97,7 +97,7 @@ define([
if (item_data.for_user) {
url += '&share_type=user&username=' + encodeURIComponent(item_data.user);
} else {
url += '&share_type=group&username=' + encodeURIComponent(item_data.group_id);
url += '&share_type=group&group_id=' + encodeURIComponent(item_data.group_id);
}
$.ajax({
url: url,
@@ -107,8 +107,18 @@ define([
success: function () {
_this.remove();
},
error: {
// TODO
error: function (xhr) {
var err_msg;
if (xhr.responseText) {
err_msg = gettext("Delete failed");
} else {
err_msg = gettext("Failed. Please check the network.");
}
if (item_data.for_user) {
$('#dir-user-share .error').html(err_msg).removeClass('hide');
} else {
$('#dir-group-group .error').html(err_msg).removeClass('hide');
}
}
});
}

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

@@ -551,6 +551,7 @@ define([
},
dirUserShare: function () {
var panel = $('#dir-user-share');
var form = this.$('#add-dir-user-share-item');
var emails_input = $('[name="emails"]', form),
@@ -572,14 +573,13 @@ define([
dataType: 'json',
method: 'PUT',
beforeSend: Common.prepareCSRFToken,
trandition: true,
traditional: true,
data: {
'share_type': 'user',
'username': emails.split(','),
'permission': perm
},
success: function(data) {
// todo: those failed to share to
$(data.success).each(function(index, item) {
var new_item = new FolderShareItemView({
'repo_id': repo_id,
@@ -594,14 +594,26 @@ define([
$add_item.after(new_item.el);
});
emails_input.select2("val", "");
if (data.failed) {
var err_msg = gettext("Failed to share to {placeholder}")
.replace('{placeholder}', Common.HTMLescape(data.failed.join(', ')));
$('.error', panel).html(err_msg).removeClass('hide');
}
},
error: function(xhr) {
// todo
var err_msg;
if (xhr.responseText) {
err_msg = gettext("Share failed");
} else {
err_msg = gettext("Failed. Please check the network.")
}
$('.error', panel).html(err_msg).removeClass('hide');
}
});
},
dirGroupShare: function () {
var panel = $('#dir-group-share');
var form = this.$('#add-dir-group-share-item');
var groups_input = $('[name="groups"]', form),
@@ -624,14 +636,13 @@ define([
dataType: 'json',
method: 'PUT',
beforeSend: Common.prepareCSRFToken,
trandition: true,
traditional: true,
data: {
'share_type': 'group',
'group_id': groups,
'permission': perm
},
success: function(data) {
// todo: those failed to share to
$(data.success).each(function(index, item) {
var new_item = new FolderShareItemView({
'repo_id': repo_id,
@@ -648,7 +659,13 @@ define([
groups_input.select2("val", "");
},
error: function(xhr) {
// todo
var err_msg;
if (xhr.responseText) {
err_msg = gettext("Share failed");
} else {
err_msg = gettext("Failed. Please check the network.")
}
$('.error', panel).html(err_msg).removeClass('hide');
}
});
}

4
static/scripts/common.js
View File

@@ -95,7 +95,6 @@ define([
case 'send_shared_upload_link': return siteRoot + 'share/upload_link/send/';
case 'delete_shared_upload_link': return siteRoot + 'share/ajax/upload_link/remove/';
case 'get_share_upload_link': return siteRoot + 'share/ajax/get-upload-link/';
//case 'private_share_dir': return siteRoot + 'share/ajax/private-share-dir/';
case 'private_share_file': return siteRoot + 'share/ajax/private-share-file/';
case 'get_popup_notices': return siteRoot + 'ajax/get_popup_notices/';
case 'set_notices_seen': return siteRoot + 'ajax/set_notices_seen/';
@@ -113,9 +112,6 @@ define([
case 'starred_files': return siteRoot + 'api2/starredfiles/';
case 'shared_repos': return siteRoot + 'api2/shared-repos/' + options.repo_id + '/';
case 'search_user': return siteRoot + 'api2/search-user/';
case 'share_permission_admin': return siteRoot + 'share/permission_admin/';
//case 'get_dir_user_share_items': return siteRoot + 'ajax/lib/' + options.repo_id + '/dir-user-share-items/';
//case 'get_dir_group_share_items': return siteRoot + 'ajax/lib/' + options.repo_id + '/dir-group-share-items/';
case 'dir_shared_items': return siteRoot + 'api2/repos/' + options.repo_id + '/dir/shared_items/';
}
},