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

Merge branch 'dir-share-popup'

Browse Source 
Conflicts:
	seahub/api2/views.py
	static/scripts/app/views/share.js
	static/scripts/common.js
	tests/api/test_shares.py
This commit is contained in:
zhengxie
2015-07-15 15:06:56 +08:00
parent 1144c15ed7 eaa93960f0
commit 00f64782ad
26 changed files with 1062 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
static/scripts/app/views/folder-perm-item.js
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');

8
static/scripts/app/views/folder-perm.js
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

129
static/scripts/app/views/folder-share-item.js Normal file
View File

@@ -0,0 +1,129 @@
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 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();
$.ajax({
url: url,
dataType: 'json',
method: 'POST',
beforeSend: Common.prepareCSRFToken,
data: {
'permission': perm
},
success: function () {
item_data.perm = perm;
_this.render();
},
error: function(xhr) {
var err_msg;
if (xhr.responseText) {
err_msg = gettext("Edit 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');
}
}
});
},
del: function () {
var _this = this;
var item_data = this.item_data;
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);
}
$.ajax({
url: url,
dataType: 'json',
method: 'DELETE',
beforeSend: Common.prepareCSRFToken,
success: function () {
_this.remove();
},
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');
}
}
});
}
});
return FolderShareItemView;
});

250
static/scripts/app/views/share.js
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({
@@ -42,7 +43,17 @@ define([
this.uploadLinkPanelInit();
}
if (!this.is_virtual && this.is_repo_owner) {
this.dirPrivateSharePanelInit();
this.dirUserSharePanelInit();
this.dirGroupSharePanelInit();
var _this = this;
$(document).on('click', function(e) {
var target = e.target || event.srcElement;
if (!_this.$('.perm-edit-icon, .perm-toggle-select').is(target)) {
_this.$('.perm').removeClass('hide');
_this.$('.perm-toggle-select').addClass('hide');
}
});
}
}
},
@@ -81,11 +92,9 @@ define([
'click #cancel-share-upload-link': 'cancelShareUploadLink',
'click #delete-upload-link': 'deleteUploadLink',
// file private share
'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) {
@@ -407,14 +416,50 @@ define([
});
},
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: 'dir_shared_items',
repo_id: repo_id
}),
'data': {
'p': path,
'share_type': 'user'
},
'after_op_success': function (data) {
$(data).each(function(index, item) {
var new_item = new FolderShareItemView({
'repo_id': repo_id,
'path': path,
'item_data': {
"user": item.user_info.name,
"user_name": item.user_info.nickname,
"perm": item.permission,
'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++) {
@@ -422,59 +467,164 @@ 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: 'dir_shared_items',
repo_id: repo_id
}),
'data': {
'p': path,
'share_type': 'group'
},
'after_op_success': function (data) {
$(data).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,
"perm": item.permission,
'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'),
form_id = form.attr('id');
dirUserShare: function () {
var panel = $('#dir-user-share');
var form = this.$('#add-dir-user-share-item');
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 post_data = {
'repo_id': this.repo_id,
'path': this.dirent_path
};
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 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');
}
};
var $add_item = $('#add-dir-user-share-item');
var repo_id = this.repo_id,
path = this.dirent_path;
var perm = $('[name="permission"]', form).val();
Common.ajaxPost({
'form': form,
'post_url': post_url,
'post_data': post_data,
'after_op_success': after_op_success,
'form_id': form_id
$.ajax({
url: Common.getUrl({
name: 'dir_shared_items',
repo_id: repo_id
}) + '?p=' + encodeURIComponent(path),
dataType: 'json',
method: 'PUT',
beforeSend: Common.prepareCSRFToken,
traditional: true,
data: {
'share_type': 'user',
'username': emails.split(','),
'permission': perm
},
success: function(data) {
$(data.success).each(function(index, item) {
var new_item = new FolderShareItemView({
'repo_id': repo_id,
'path': path,
'item_data': {
"user": item.user_info.name,
"user_name": item.user_info.nickname,
"perm": item.permission,
'for_user': true
}
});
$add_item.after(new_item.el);
});
emails_input.select2("val", "");
if (data.failed.length > 0) {
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) {
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),
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();
$.ajax({
url: Common.getUrl({
name: 'dir_shared_items',
repo_id: repo_id
}) + '?p=' + encodeURIComponent(path),
dataType: 'json',
method: 'PUT',
beforeSend: Common.prepareCSRFToken,
traditional: true,
data: {
'share_type': 'group',
'group_id': groups,
'permission': perm
},
success: function(data) {
$(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,
"perm": item.permission,
'for_user': false
}
});
$add_item.after(new_item.el);
});
groups_input.select2("val", "");
},
error: function(xhr) {
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');
}
});
return false;
}
});
return SharePopupView;

2
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 'get_popup_notices': return siteRoot + 'ajax/get_popup_notices/';
case 'set_notices_seen': return siteRoot + 'ajax/set_notices_seen/';
case 'get_unseen_notices_num': return siteRoot + 'ajax/unseen-notices-count/';
@@ -112,6 +111,7 @@ 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 'dir_shared_items': return siteRoot + 'api2/repos/' + options.repo_id + '/dir/shared_items/';
}
},