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

[group owned repo] share: enable 'share to user/group'

Browse Source
This commit is contained in:
llj
2018-06-09 17:57:39 +08:00
parent fde748909e
commit ce23a58edf
6 changed files with 369 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
seahub/templates/js/templates.html
View File

@@ -263,6 +263,7 @@
<% } %>
<% } else { %>
<% if (is_staff) { %>
<a href="#" class="sf2-icon-share sf2-x repo-share-btn op-icon vh" title="{% trans "Share" %}" aria-label="{% trans "Share" %}"></a>
<a href="#" class="sf2-icon-delete sf2-x delete-repo op-icon vh" title="{% trans "Delete" %}" aria-label="{% trans "Delete" %}"></a>
<div class="sf-dropdown sf-dropdown-inline">
<a href="#" class="sf2-icon-caret-down more-op-icon op-icon vh sf-dropdown-toggle" title="{% trans "More Operations" %}" aria-label="{% trans "More Operations" %}"></a>
@@ -320,6 +321,7 @@
<div class="sf-dropdown sf-dropdown-inline">
<a href="#" class="sf2-icon-caret-down more-op-icon op-icon sf-dropdown-toggle" title="{% trans "More Operations" %}" aria-label="{% trans "More Operations" %}"></a>
<ul class="hidden-op repo-hidden-op hide sf-dropdown-menu">
<li><a class="op repo-share-btn" href="#">{% trans "Share" %}</a></li>
<li><a class="op delete-repo" href="#">{% trans "Delete" %}</a></li>
<li><a class="op js-repo-rename" href="#">{% trans "Rename" %}</a></li>
<% if (app.pageOptions.folder_perm_enabled) { %>
@@ -1132,7 +1134,8 @@
<% if (user_perm == 'rw' && !repo_encrypted && can_generate_upload_link) { %>
<li class="tab"><a href="#dir-upload-link-share" class="a">{% trans "Upload Link" %}</a></li>
<% } %>
<% if (!is_virtual && (is_repo_owner || is_admin)) { %> {# dir private share #}
<% if (enable_dir_private_share) { %> {# dir private share #}
<li class="tab"><a href="#dir-user-share" class="a">{% trans "Share to user" %}</a></li>
<li class="tab"><a href="#dir-group-share" class="a">{% trans "Share to group" %}</a></li>
<% } %>
@@ -1261,7 +1264,7 @@
</div>
<% } %>
<% if (!is_virtual && (is_repo_owner || is_admin)) { %>
<% if (enable_dir_private_share) { %> {# dir private share #}
<% if (!repo_encrypted) { %>
<div id="dir-user-share" class="tabs-panel hide">
<% } else { %>
@@ -1284,7 +1287,7 @@
<select name="permission" class="share-permission-select w100">
<option value="rw" selected="selected">{% trans "Read-Write" %}</option>
<option value="r">{% trans "Read-Only" %}</option>
<% if (app.pageOptions.is_pro && dirent_path == '/') { %> {# only for repo #}
<% if (show_admin_perm_option) { %>
<option value="admin">{% trans "Admin" %}</option>
<% } %>
</select>
@@ -1320,7 +1323,7 @@
<select name="permission" class="share-permission-select w100">
<option value="rw" selected="selected">{% trans "Read-Write" %}</option>
<option value="r">{% trans "Read-Only" %}</option>
<% if (app.pageOptions.is_pro && dirent_path == '/') { %> {# only for repo #}
<% if (show_admin_perm_option) { %>
<option value="admin">{% trans "Admin" %}</option>
<% } %>
</select>
@@ -1331,7 +1334,7 @@
</table>
<p class="error hide"></p>
</div>
<% } %> {# if (!is_virtual && is_repo_owner) #}
<% } %> {# end of 'dir private share' #}
<% } %> {# if is_dir #}
</div>

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

@@ -450,6 +450,7 @@ define([
},
success: function() {
_this.dir.user_can_set_folder_perm = false;
_this.is_address_book_group_admin = false;
if (_this.contextOptions &&
_this.contextOptions.group_id) { // the repo is in a group
_this.getGroupInfo();
@@ -490,6 +491,9 @@ define([
if (data.parent_group_id != 0 && // address book group
$.inArray(app.pageOptions.username, data.admins) != -1) { // user is group admin
_this.dir.user_can_set_folder_perm = true;
_this.is_address_book_group_admin = true;
_this.parent_group_id = data.parent_group_id;
}
_this.reset();
},
@@ -860,6 +864,13 @@ define([
};
if (app.pageOptions.is_pro) {
options.is_admin = dir.is_admin;
if (this.is_address_book_group_admin) {
$.extend(options, {
is_address_book_group_admin: true,
parent_group_id: this.parent_group_id
});
}
}
new ShareView(options);
},

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

@@ -22,7 +22,9 @@ define([
// show info about 'is_admin'
this.show_admin = false;
if (app.pageOptions.is_pro && this.path == '/') {
if (app.pageOptions.is_pro &&
this.path == '/' &&
!this.item_data.parent_group_id) { // not for group owned repo
this.show_admin = true;
}
@@ -60,8 +62,34 @@ define([
editPerm: function (e) {
var _this = this;
var perm = $(e.currentTarget).val();
var item_data = this.item_data;
var url = Common.getUrl({
var url, method, data;
if (item_data.parent_group_id) { // group owned repo
if (item_data.for_user) {
url = Common.getUrl({
name: 'group_owned_repo_user_share',
repo_id: this.repo_id
});
data = {
'username': item_data.user_email,
'permission': perm,
'path': this.path
};
} else {
url = Common.getUrl({
name: 'group_owned_repo_group_share',
repo_id: this.repo_id
});
data = {
'group_id': item_data.group_id,
'permission': perm,
'path': this.path
};
}
method = 'PUT';
} else {
url = Common.getUrl({
name: 'dir_shared_items',
repo_id: this.repo_id
}) + '?p=' + encodeURIComponent(this.path);
@@ -70,15 +98,17 @@ define([
} else {
url += '&share_type=group&group_id=' + encodeURIComponent(item_data.group_id);
}
var perm = $(e.currentTarget).val();
data = {
'permission': perm
};
method = 'POST';
}
$.ajax({
url: url,
dataType: 'json',
method: 'POST',
method: method,
beforeSend: Common.prepareCSRFToken,
data: {
'permission': perm
},
data: data,
success: function () {
if (perm == 'admin') {
item_data.is_admin = true;
@@ -108,7 +138,30 @@ define([
del: function () {
var _this = this;
var item_data = this.item_data;
var url = Common.getUrl({
var url, data = {};
if (item_data.parent_group_id) { // group owned repo
if (item_data.for_user) {
url = Common.getUrl({
name: 'group_owned_repo_user_share',
repo_id: this.repo_id
});
data = {
'username': item_data.user_email,
'path': this.path
};
} else {
url = Common.getUrl({
name: 'group_owned_repo_group_share',
repo_id: this.repo_id
});
data = {
'group_id': item_data.group_id,
'p': this.path // TODO: 'p'?
};
}
} else {
url = Common.getUrl({
name: 'dir_shared_items',
repo_id: this.repo_id
}) + '?p=' + encodeURIComponent(this.path);
@@ -117,11 +170,13 @@ define([
} else {
url += '&share_type=group&group_id=' + encodeURIComponent(item_data.group_id);
}
}
$.ajax({
url: url,
dataType: 'json',
method: 'DELETE',
beforeSend: Common.prepareCSRFToken,
data: data,
success: function () {
_this.remove();
},

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

@@ -16,6 +16,7 @@ define([
template: _.template($('#group-repo-tmpl').html()),
mobileTemplate: _.template($('#group-repo-mobile-tmpl').html()),
renameTemplate: _.template($("#repo-rename-form-template").html()),
events: {
@@ -259,6 +260,14 @@ define([
if (app.pageOptions.is_pro) {
options.is_admin = this.model.get('is_admin'); // 'is_admin': repo is shared to the group with 'admin' perm
// private share group owned repo
if (this.parent_group_id && this.is_staff) {
$.extend(options, {
'is_address_book_group_admin': true,
'parent_group_id': this.parent_group_id
});
}
}
new ShareView(options);

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

@@ -15,8 +15,14 @@ define([
initialize: function(options) {
this.is_repo_owner = options.is_repo_owner;
// for shared repo
this.is_admin = options.is_admin; // true or undefined
// for group owned repo
this.is_address_book_group_admin = options.is_address_book_group_admin;
this.parent_group_id = options.parent_group_id;
this.is_virtual = options.is_virtual;
this.user_perm = options.user_perm;
this.repo_id = options.repo_id;
@@ -25,6 +31,15 @@ define([
this.obj_name = options.obj_name;
this.is_dir = options.is_dir;
// share to user/group
var enable_dir_private_share = false;
if (!this.is_virtual &&
(this.is_repo_owner || this.is_admin ||
(this.is_address_book_group_admin && this.dirent_path == '/'))) {
enable_dir_private_share = true;
}
this.enable_dir_private_share = enable_dir_private_share;
this.render();
if ($(window).width() >= 768) {
@@ -47,7 +62,7 @@ define([
if (this.user_perm == 'rw' && !this.repo_encrypted && app.pageOptions.can_generate_upload_link) {
this.uploadLinkPanelInit();
}
if (!this.is_virtual && (this.is_repo_owner || this.is_admin)) {
if (this.enable_dir_private_share) {
this.dirUserSharePanelInit();
this.dirGroupSharePanelInit();
@@ -64,19 +79,27 @@ define([
},
render: function () {
var show_admin_perm_option = false;
if (app.pageOptions.is_pro &&
this.dirent_path == '/' && // only for repo
!this.parent_group_id) { // not for group owned repo
show_admin_perm_option = true;
}
this.$el.html(this.template({
title: gettext("Share {placeholder}")
.replace('{placeholder}', '<span class="op-target ellipsis ellipsis-op-target" title="' + Common.HTMLescape(this.obj_name) + '">' + Common.HTMLescape(this.obj_name) + '</span>'),
is_dir: this.is_dir,
is_repo_owner: this.is_repo_owner,
is_admin: this.is_admin,
is_virtual: this.is_virtual,
enable_dir_private_share: this.enable_dir_private_share,
show_admin_perm_option: show_admin_perm_option,
user_perm: this.user_perm,
repo_id: this.repo_id,
can_generate_share_link: app.pageOptions.can_generate_share_link,
can_generate_upload_link: app.pageOptions.can_generate_upload_link,
repo_encrypted: this.repo_encrypted,
dirent_path: this.dirent_path
can_generate_share_link: app.pageOptions.can_generate_share_link,
can_generate_upload_link: app.pageOptions.can_generate_upload_link
}));
return this;
@@ -572,23 +595,63 @@ define([
});
},
prepareUserItemData: function(item) {
var item_data = {
'for_user': true
};
if (this.parent_group_id) { // group owned repo
// [{permission: "rw", user_name: "llj", user_email: "llj@1.com", user_contact_email: "llj@1.com"}]
$.extend(item_data, {
"user_email": item.user_email,
"user_name": item.user_name,
"permission": item.permission,
'parent_group_id': this.parent_group_id
});
} else {
$.extend(item_data, {
"user_email": item.user_info.name,
"user_name": item.user_info.nickname,
"permission": item.permission,
'is_admin': item.is_admin
});
}
return item_data;
},
dirUserSharePanelInit: function() {
var _this = this;
var $loadingTip = this.$('.loading-tip').show();
var $panel = this.$('#dir-user-share');
var $table = $('table', $panel);
var $add_item = $('#add-dir-user-share-item');
var repo_id = this.repo_id,
path = this.dirent_path;
$.ajax({
url: Common.getUrl({
var url, data;
if (this.parent_group_id) {
url = Common.getUrl({
name: 'group_owned_repo_user_share',
repo_id: repo_id
});
data = {
'path': path
};
} else {
url = Common.getUrl({
name: 'dir_shared_items',
repo_id: repo_id
}),
data: {
});
data = {
'p': path,
'share_type': 'user'
},
};
}
$.ajax({
url: url,
data: data,
cache: false,
dataType: 'json',
success: function(data) {
@@ -596,13 +659,7 @@ define([
var new_item = new FolderShareItemView({
'repo_id': repo_id,
'path': path,
'item_data': {
"user_email": item.user_info.name,
"user_name": item.user_info.nickname,
"permission": item.permission,
'is_admin': item.is_admin,
'for_user': true
}
'item_data': _this.prepareUserItemData(item)
});
$add_item.after(new_item.el);
});
@@ -630,52 +687,33 @@ define([
});
},
dirGroupSharePanelInit: function() {
var $loadingTip = this.$('.loading-tip').show();
var $panel = this.$('#dir-group-share');
var $table = $('table', $panel);
var $add_item = $('#add-dir-group-share-item');
var repo_id = this.repo_id,
path = this.dirent_path;
$.ajax({
url: Common.getUrl({
name: 'dir_shared_items',
repo_id: repo_id
}),
data: {
'p': path,
'share_type': 'group'
},
cache: false,
dataType: 'json',
success: function(data) {
$(data).each(function(index, item) {
var new_item = new FolderShareItemView({
'repo_id': repo_id,
'path': path,
'item_data': {
prepareGroupItemData: function(item) {
var item_data = {
'for_user': false
};
if (this.parent_group_id) { // address book group
$.extend(item_data, {
"group_id": item.group_id,
"group_name": item.group_name,
"permission": item.permission,
"parent_group_id": this.parent_group_id
});
} else {
$.extend(item_data, {
"group_id": item.group_info.id,
"group_name": item.group_info.name,
"permission": item.permission,
'is_admin': item.is_admin,
'for_user': false
'is_admin': item.is_admin
});
}
});
$add_item.after(new_item.el);
});
return item_data;
},
// for common repo
prepareAvailableGroups: function(options) {
var groups = [];
var prepareGroupsSelector = function() {
var g_opts = '';
for (var i = 0, len = groups.length; i < len; i++) {
g_opts += '<option value="' + groups[i].id + '" data-index="' + i + '">' + groups[i].name + '</option>';
}
$('[name="groups"]', $add_item).html(g_opts).select2({
placeholder: gettext("Select groups"),
escapeMarkup: function(m) { return m; }
});
};
if (app.pageOptions.enable_share_to_all_groups) {
$.ajax({
url: Common.getUrl({
@@ -696,28 +734,111 @@ define([
});
},
error: function(xhr, textStatus, errorThrown) {
var pre_msg = gettext("Failed to fetch groups:");
var err_msg;
if (xhr.responseText) {
if (xhr.status == 403) {
err_msg = gettext("Permission error");
} else {
err_msg = xhr.responseJSON.error_msg ? xhr.responseJSON.error_msg : gettext('Error');
}
} else {
err_msg = gettext('Please check the network.');
}
$('.error', $panel).html(pre_msg + ' ' + err_msg).show();
// do nothing
},
complete: function() {
prepareGroupsSelector();
$table.removeClass('hide');
options.callback(groups);
}
});
} else {
groups = app.pageOptions.joined_groups_exclude_address_book || [];
prepareGroupsSelector();
options.callback(groups);
}
},
// for group owned repo
prepareAvailableGroupsForGroupOwnedRepo: function(options) {
var groups = [];
$.ajax({
url: Common.getUrl({
name: 'all_groups'
}),
type: 'GET',
dataType: 'json',
cache: false,
success: function(data){
for (var i = 0, len = data.length; i < len; i++) {
groups.push({
'id': data[i].id,
'name': data[i].name
});
}
groups.sort(function(a, b) {
return Common.compareTwoWord(a.name, b.name);
});
},
error: function(xhr, textStatus, errorThrown) {
// do nothing
},
complete: function() {
options.callback(groups);
}
});
},
dirGroupSharePanelInit: function() {
var _this = this;
var $loadingTip = this.$('.loading-tip').show();
var $panel = this.$('#dir-group-share');
var $table = $('table', $panel);
var $add_item = $('#add-dir-group-share-item');
var url, data;
var repo_id = this.repo_id,
path = this.dirent_path;
if (this.parent_group_id) { // group owned repo
url = Common.getUrl({
name: 'group_owned_repo_group_share',
repo_id: repo_id
});
data = {
'path': path
};
} else {
url = Common.getUrl({
name: 'dir_shared_items',
repo_id: repo_id
});
data = {
'p': path,
'share_type': 'group'
};
}
$.ajax({
url: url,
data: data,
cache: false,
dataType: 'json',
success: function(data) {
// for 'group owned repo', the data is like
// `[{"permission":"rw","group_id":4,"group_name":"ab group"}]`
$(data).each(function(index, item) {
var new_item = new FolderShareItemView({
'repo_id': repo_id,
'path': path,
'item_data': _this.prepareGroupItemData(item)
});
$add_item.after(new_item.el);
});
var prepareGroupsSelector = function(groups) {
var g_opts = '';
for (var i = 0, len = groups.length; i < len; i++) {
g_opts += '<option value="' + groups[i].id + '" data-index="' + i + '">' + groups[i].name + '</option>';
}
$('[name="groups"]', $add_item).html(g_opts).select2({
placeholder: gettext("Select groups"),
escapeMarkup: function(m) { return m; }
});
$table.removeClass('hide');
};
if (_this.parent_group_id) { // group owned repo
_this.prepareAvailableGroupsForGroupOwnedRepo({'callback': prepareGroupsSelector});
} else {
_this.prepareAvailableGroups({'callback': prepareGroupsSelector});
}
},
error: function(xhr, textStatus, errorThrown) {
@@ -744,6 +865,8 @@ define([
},
dirUserShare: function () {
var _this = this;
var $panel = $('#dir-user-share');
var $form = this.$('#add-dir-user-share-item'); // pseudo form
@@ -761,34 +884,47 @@ define([
var $error = $('.error', $panel);
var $submitBtn = $('[type="submit"]', $form);
Common.disableButton($submitBtn);
$.ajax({
url: Common.getUrl({
var url, method, data;
if (this.parent_group_id) { // group owned repo
url = Common.getUrl({
name: 'group_owned_repo_user_share',
repo_id: repo_id
});
method = 'POST';
data = {
'permission': perm,
'path': path,
'username': emails.split(',')
};
} else {
url = Common.getUrl({
name: 'dir_shared_items',
repo_id: repo_id
}) + '?p=' + encodeURIComponent(path),
dataType: 'json',
method: 'PUT',
beforeSend: Common.prepareCSRFToken,
traditional: true,
data: {
}) + '?p=' + encodeURIComponent(path);
method = 'PUT';
data = {
'share_type': 'user',
'username': emails.split(','),
'permission': perm
},
};
}
Common.disableButton($submitBtn);
$.ajax({
url: url,
dataType: 'json',
method: method,
beforeSend: Common.prepareCSRFToken,
traditional: true,
data: data,
success: function(data) {
// success: [{permission: "rw", user_name: "llj", user_email: "llj@1.com", user_contact_email: "llj@1.com"}]
if (data.success.length > 0) {
$(data.success).each(function(index, item) {
var new_item = new FolderShareItemView({
'repo_id': repo_id,
'path': path,
'item_data': {
"user_email": item.user_info.name,
"user_name": item.user_info.nickname,
"permission": item.permission,
'is_admin': item.is_admin,
'for_user': true
}
'item_data': _this.prepareUserItemData(item)
});
$add_item.after(new_item.el);
});
@@ -822,6 +958,8 @@ define([
},
dirGroupShare: function () {
var _this = this;
var $panel = $('#dir-group-share');
var $form = this.$('#add-dir-group-share-item'); // pseudo form
@@ -840,34 +978,46 @@ define([
var $error = $('.error', $panel);
var $submitBtn = $('[type="submit"]', $form);
Common.disableButton($submitBtn);
$.ajax({
url: Common.getUrl({
var url, method, data;
if (this.parent_group_id) {
url = Common.getUrl({
name: 'group_owned_repo_group_share',
repo_id: repo_id
});
method = 'POST';
data = {
'path': path,
'group_id': groups,
'permission': perm
};
} else {
url = Common.getUrl({
name: 'dir_shared_items',
repo_id: repo_id
}) + '?p=' + encodeURIComponent(path),
dataType: 'json',
method: 'PUT',
beforeSend: Common.prepareCSRFToken,
traditional: true,
data: {
}) + '?p=' + encodeURIComponent(path);
method = 'PUT';
data = {
'share_type': 'group',
'group_id': groups,
'permission': perm
},
};
}
Common.disableButton($submitBtn);
$.ajax({
url: url,
dataType: 'json',
method: method,
beforeSend: Common.prepareCSRFToken,
traditional: true,
data: data,
success: function(data) {
if (data.success.length > 0) {
$(data.success).each(function(index, item) {
var new_item = new FolderShareItemView({
'repo_id': repo_id,
'path': path,
'item_data': {
"group_id": item.group_info.id,
"group_name": item.group_info.name,
"permission": item.permission,
'is_admin': item.is_admin,
'for_user': false
}
'item_data': _this.prepareGroupItemData(item)
});
$add_item.after(new_item.el);
});

3
static/scripts/common.js
View File

@@ -143,6 +143,7 @@ define([
// Group
case 'groups': return siteRoot + 'api/v2.1/groups/';
case 'all_groups': return siteRoot + 'api/v2.1/all-groups/';
case 'shareable_groups': return siteRoot + 'api/v2.1/shareable-groups/';
case 'search_group': return siteRoot + 'api/v2.1/search-group/';
case 'group': return siteRoot + 'api/v2.1/groups/' + options.group_id + '/';
@@ -153,6 +154,8 @@ define([
case 'group_repos': return siteRoot + 'api2/groups/' + options.group_id + '/repos/';
case 'group_owned_repos': return siteRoot + 'api/v2.1/groups/' + options.group_id + '/group-owned-libraries/';
case 'group_owned_repo': return siteRoot + 'api/v2.1/groups/' + options.group_id + '/group-owned-libraries/' + options.repo_id + '/';
case 'group_owned_repo_user_share': return siteRoot + 'api/v2.1/group-owned-libraries/' + options.repo_id + '/user-share/';
case 'group_owned_repo_group_share': return siteRoot + 'api/v2.1/group-owned-libraries/' + options.repo_id + '/group-share/';
case 'address_book_sub_groups': return siteRoot + 'api/v2.1/address-book/groups/' + options.group_id + '/sub-groups/';
case 'address_book_group_search_members': return siteRoot + 'api/v2.1/address-book/groups/' + options.group_id + '/search-member/';
case 'group_discussions': return siteRoot + 'api2/groups/' + options.group_id + '/discussions/';