1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-24 21:07:17 +00:00

[dir private share] split into user/group share

This commit is contained in:
llj
2015-06-26 15:45:15 +08:00
committed by zhengxie
parent 61dff076d4
commit 6ff2efb597
11 changed files with 396 additions and 73 deletions

View File

@@ -29,7 +29,7 @@ define([
'mouseleave': 'hidePermOpIcons',
'click .perm-edit-icon': 'editIconClick',
'change .perm-toggle-select': 'editPerm',
'click .perm-delete-icon': 'deletePerm'
'click .delete-icon': 'deletePerm'
},
showPermOpIcons: function () {
@@ -54,15 +54,15 @@ define([
'path': this.path,
'type': 'modify'
};
var is_user_perm = this.item_data.is_user_perm;
if (is_user_perm) {
var for_user = this.item_data.for_user;
if (for_user) {
$.extend(post_data, {'user': this.item_data.user});
} else {
$.extend(post_data, {'group_id': this.item_data.group_id});
}
$.ajax({
url: Common.getUrl({
name: is_user_perm ? 'set_user_folder_perm' : 'set_group_folder_perm',
name: for_user ? 'set_user_folder_perm' : 'set_group_folder_perm',
repo_id: this.repo_id
}),
type: 'POST',
@@ -81,7 +81,7 @@ define([
} else {
err = gettext("Failed. Please check the network.");
}
if (is_user_perm) {
if (for_user) {
$('#user-folder-perm .error').html(err).removeClass('hide');
} else {
$('#group-folder-perm .error').html(err).removeClass('hide');
@@ -97,15 +97,15 @@ define([
'path': this.path,
'type': 'delete'
};
var is_user_perm = this.item_data.is_user_perm;
if (is_user_perm) {
var for_user = this.item_data.for_user;
if (for_user) {
$.extend(post_data, {'user': this.item_data.user});
} else {
$.extend(post_data, {'group_id': this.item_data.group_id});
}
$.ajax({
url: Common.getUrl({
name: is_user_perm ? 'set_user_folder_perm' : 'set_group_folder_perm',
name: for_user ? 'set_user_folder_perm' : 'set_group_folder_perm',
repo_id: this.repo_id
}),
type: 'POST',
@@ -123,7 +123,7 @@ define([
} else {
err = gettext("Failed. Please check the network.");
}
if (is_user_perm) {
if (for_user) {
$('#user-folder-perm .error').html(err).removeClass('hide');
} else {
$('#group-folder-perm .error').html(err).removeClass('hide');

View File

@@ -72,7 +72,7 @@ define([
var perm_item = new FolderPermItemView({
'repo_id': _this.repo_id,
'path': _this.path,
'item_data':$.extend(item, {'is_user_perm': true})
'item_data':$.extend(item, {'for_user': true})
});
$add_user_perm.after(perm_item.el);
});
@@ -81,7 +81,7 @@ define([
var perm_item = new FolderPermItemView({
'repo_id': _this.repo_id,
'path': _this.path,
'item_data':$.extend(item, {'is_user_perm': false})
'item_data':$.extend(item, {'for_user': false})
});
$add_group_perm.after(perm_item.el);
});
@@ -139,7 +139,7 @@ define([
'user': email,
'user_name': item.user_name,
'perm': perm,
'is_user_perm': true
'for_user': true
}
});
form.after(perm_item.el);
@@ -188,7 +188,7 @@ define([
'repo_id': _this.repo_id,
'path': _this.path,
'item_data': {
'is_user_perm': false,
'for_user': false,
'perm': perm,
'group_id': item.group_id,
'group_name': item.group_name

View File

@@ -0,0 +1,96 @@
define([
'jquery',
'underscore',
'backbone',
'common'
], function($, _, Backbone, Common) {
'use strict';
var FolderShareItemView = Backbone.View.extend({
tagName: 'tr',
template: _.template($('#folder-perm-item-tmpl').html()),
initialize: function(options) {
this.item_data = options.item_data;
this.repo_id = options.repo_id;
this.path = options.path;
this.render();
},
render: function () {
this.$el.html(this.template(this.item_data));
return this;
},
events: {
'mouseenter': 'showOpIcons',
'mouseleave': 'hideOpIcons',
'click .perm-edit-icon': 'editIconClick',
'change .perm-toggle-select': 'editPerm',
'click .delete-icon': 'del'
},
showOpIcons: function () {
this.$el.find('.op-icon').removeClass('vh');
},
hideOpIcons: function () {
this.$el.find('.op-icon').addClass('vh');
},
editIconClick: function (e) {
$(e.currentTarget).closest('td')
.find('.perm').addClass('hide').end()
.find('.perm-toggle-select').removeClass('hide');
},
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 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',
dataType: 'json',
cache: false,
beforeSend: Common.prepareCSRFToken,
data: post_data,
success: function() {
item_data.perm = perm;
_this.render();
},
error: function(xhr) {
var err;
if (xhr.responseText) {
err = $.parseJSON(xhr.responseText).error;
} else {
err = gettext("Failed. Please check the network.");
}
if (share_type == 'personal') {
$('#dir-user-share .error').html(err).removeClass('hide');
} else {
$('#dir-group-group .error').html(err).removeClass('hide');
}
}
});
},
del: function () {
}
});
return FolderShareItemView;
});

View File

@@ -4,8 +4,9 @@ define([
'backbone',
'common',
'jquery.ui.tabs',
'select2'
], function($, _, Backbone, Common, Tabs, Select2) {
'select2',
'app/views/folder-share-item'
], function($, _, Backbone, Common, Tabs, Select2, FolderShareItemView) {
'use strict';
var SharePopupView = Backbone.View.extend({
@@ -45,7 +46,8 @@ define([
this.uploadLinkPanelInit();
}
if (!this.is_virtual && this.is_repo_owner) {
this.dirPrivateSharePanelInit();
this.dirUserSharePanelInit();
this.dirGroupSharePanelInit();
}
}
},
@@ -88,7 +90,8 @@ define([
'submit #file-private-share-form': 'filePrivateShare',
// dir private share
'submit #dir-private-share-form': 'dirPrivateShare'
'click #add-dir-user-share-item .submit': 'dirUserShare',
'click #add-dir-group-share-item .submit': 'dirGroupShare'
},
highlightCheckbox: function (e) {
@@ -458,14 +461,44 @@ define([
return false;
},
dirPrivateSharePanelInit: function() {
// no 'share to all'
var form = this.$('#dir-private-share-form');
dirUserSharePanelInit: function() {
var form = this.$('#dir-user-share');
$('[name="emails"]', form).select2($.extend({
width: '400px'
width: '297px'
},Common.contactInputOptionsForSelect2()));
// show existing items
var $add_item = $('#add-dir-user-share-item');
var repo_id = this.repo_id,
path = this.dirent_path;
Common.ajaxGet({
'get_url': Common.getUrl({
name: 'get_dir_user_share_items',
repo_id: repo_id
}),
'data': {'p': path},
'after_op_success': function (data) {
$(data).each(function(index, item) {
var new_item = new FolderShareItemView({
'repo_id': repo_id,
'path': path,
'item_data':$.extend(item, {
'for_user': true
})
});
$add_item.after(new_item.el);
});
}
});
form.removeClass('hide');
this.$('.loading-tip').hide();
},
dirGroupSharePanelInit: function() {
var form = this.$('#dir-group-share');
var groups = app.pageOptions.groups || [];
var g_opts = '';
for (var i = 0, len = groups.length; i < len; i++) {
@@ -473,48 +506,117 @@ define([
}
$('[name="groups"]', form).html(g_opts).select2({
placeholder: gettext("Select groups"),
width: '400px',
width: '297px',
escapeMarkup: function(m) { return m; }
});
// show existing items
var $add_item = $('#add-dir-group-share-item');
var repo_id = this.repo_id,
path = this.dirent_path;
Common.ajaxGet({
'get_url': Common.getUrl({
name: 'get_dir_group_share_items',
repo_id: repo_id
}),
'data': {'p': path},
'after_op_success': function (data) {
$(data).each(function(index, item) {
var new_item = new FolderShareItemView({
'repo_id': repo_id,
'path': path,
'item_data': $.extend(item, {
'for_user': false
})
});
$add_item.after(new_item.el);
});
}
});
form.removeClass('hide');
this.$('.loading-tip').hide();
},
dirPrivateShare: function () {
var form = this.$('#dir-private-share-form'),
dirUserShare: function () {
var form = this.$('#add-dir-user-share-item'),
form_id = form.attr('id');
var emails = $('[name="emails"]', form).val(), // string
groups = $('[name="groups"]', form).val(); // null or [group.id]
if (!emails && !groups) {
Common.showFormError(form_id, gettext("Please select a contact or a group."));
var emails_input = $('[name="emails"]', form),
emails = emails_input.val(); // string
if (!emails) {
return false;
}
var $add_item = $('#add-dir-user-share-item');
var repo_id = this.repo_id,
path = this.dirent_path;
var perm = $('[name="permission"]', form).val();
var post_data = {
'repo_id': this.repo_id,
'path': this.dirent_path
'repo_id': repo_id,
'path': path,
'emails': emails,
'perm': perm
};
if (emails) {
post_data['emails'] = emails;
}
if (groups) {
post_data['groups'] = groups.join(',');
}
post_data['perm'] = $('[name="permission"]', form).val();
var post_url = Common.getUrl({name: 'private_share_dir'});
var post_url = Common.getUrl({name: 'private_share_dir'}); // TODO: modify url
var after_op_success = function(data) {
$.modal.close();
var msg = gettext("Successfully shared to {placeholder}")
.replace('{placeholder}', Common.HTMLescape(data['shared_success'].join(', ')));
Common.feedback(msg, 'success');
if (data['shared_failed'].length > 0) {
msg += '<br />' + gettext("Failed to share to {placeholder}")
.replace('{placeholder}', Common.HTMLescape(data['shared_failed'].join(', ')));
Common.feedback(msg, 'info');
}
$(data).each(function(index, item) {
var new_item = new FolderShareItemView({
'repo_id': repo_id,
'path': path,
'item_data': $.extend(item, {
'for_user': false
})
});
$add_item.after(new_item.el);
});
emails_input.select2("val", "");
};
Common.ajaxPost({
'form': form,
'post_url': post_url,
'post_data': post_data,
'after_op_success': after_op_success,
'form_id': form_id
});
return false;
},
dirGroupShare: function () {
var form = this.$('#add-dir-group-share-item'),
form_id = form.attr('id');
var groups_input = $('[name="groups"]', form),
groups = groups_input.val(); // null or [group.id]
if (!groups) {
return false;
}
var $add_item = $('#add-dir-group-share-item');
var repo_id = this.repo_id,
path = this.dirent_path;
var perm = $('[name="permission"]', form).val();
var post_data = {
'repo_id': repo_id,
'path': path,
'groups': groups.join(','),
'perm': perm
};
var post_url = Common.getUrl({name: 'private_share_dir'}); // TODO: modify url
var after_op_success = function(data) {
$(data).each(function(index, item) {
var new_item = new FolderShareItemView({
'repo_id': repo_id,
'path': path,
'item_data': $.extend(item, {
'for_user': false
})
});
$add_item.after(new_item.el);
});
groups_input.select2("val", "");
};
Common.ajaxPost({
@@ -526,6 +628,7 @@ define([
});
return false;
}
});
return SharePopupView;

View File

@@ -113,6 +113,9 @@ 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/';
}
},