| 名称 | -操作 | -
|---|---|
| {{ request.user}} | -- |
| {{ org.org_name }} | -- |
暂无
{% endif %} - - - +{% include "snippets/repo_share_form.html" %} +{% include "snippets/repo_create_form.html" %} {% endblock %} {% block extra_script %} {% endblock %} diff --git a/templates/myhome_extra_script.html b/templates/myhome_extra_script.html new file mode 100644 index 0000000000..11aab2f879 --- /dev/null +++ b/templates/myhome_extra_script.html @@ -0,0 +1,129 @@ +$(function() { + //repo-share-form share-list autocomplete + var share_list = []; + {% for contact in contacts %} + share_list.push('{{ contact.contact_email }}'); + {% endfor %} + + {% for group in groups %} + share_list.push('{{ group.props.group_name }} <{{ group.props.creator_name }}>'); + {% endfor %} + + $(".repo-share-btn").click(function() { + $("#repo_id").val($(this).attr("data")); + $("#repo-share-form").modal({appendTo: "#main"}); + addAutocomplete('#email_or_group', '#repo-share-form', share_list); + }); + + //check before post + $('#share-submit-btn').click(function() { + if (!$.trim($('#email_or_group').attr('value'))) { + $('#repo-share-form .error').removeClass('hide'); + $('#simplemodal-container').css('height', $('#repo-share-form').height()); + return false; + } + }); + + addConfirmTo($('.repo-delete-btn')); + + addConfirmTo($('.unshare-btn'), '确定要取消共享？'); + + $(".download-btn").click(function() { + window.open('{{ SITE_ROOT }}seafile_access_check/?repo_id=' + $(this).attr('data')); + }); + +//show op images when mouse hover on + $("table tr:gt(0)").hover( + function() { + $(this).find('img').css('cursor', 'pointer').removeClass('vh'); + }, + function() { + $(this).find('img').addClass('vh'); + } + ); +}); + +//repo-create-form +$('#repo-create').hover( + function() { + $(this).css({'background-color': '#fff', 'cursor': 'pointer'}); + }, + function() { + $(this).css('background-color', '#f5f5f5'); + } +); +$('#repo-create').click(function() { + $('#repo-create-form').modal({appendTo: '#main', autoResize: true}); +}); +$('#encrypt-switch').click(function () { + if ($(this).attr('checked')) { + $('#repo-create-form input[type="password"]').attr('disabled', false).removeClass('input-disabled'); + } else { + $('#repo-create-form input[type="password"]').attr('disabled', true).addClass('input-disabled'); + } +}); +function showError(err) { + $('#repo-create-form .error').html(err).attr('class','error'); + $('#simplemodal-container').css('height', $('#repo-create-form').height()); +} +$('#repo-create-submit').click(function() { + var passwd = $('#repo-create-form input[name="passwd"]'), + passwd_again = $('#repo-create-form input[name="passwd_again"]'); + + if (!$('#repo-name').val()) { + showError('目录名不能为空。'); + return false; + } + if (!$('#repo-desc').val()) { + showError('描述不能为空。'); + return false; + } + + if ($('#encrypt-switch').attr('checked')) { + if (!passwd.val()) { + showError('密码不能为空。'); + return false; + } + if (!passwd_again.val()) { + showError('请确认密码。'); + return false; + } + if (passwd.val().length < 3) { + showError('密码太短。'); + return false; + } + if (passwd.val().length > 15) { + showError('密码太长。'); + return false; + } + if (passwd.val() != passwd_again.val()) { + showError('两次输入的密码不一致。'); + return false; + } + } + + $.ajax({ + url: '{{ url }}', + type: 'POST', + dataType: 'json', + cache: 'false', + contentType: 'application/json; charset=utf-8', + beforeSend: prepareCSRFToken, + data: { + 'repo_name': $('#repo-name').val(), + 'repo_desc': $('#repo-desc').val(), + 'encryption': $('#encrypt-switch').attr('checked') ? 1 : 0, + 'passwd': passwd.val(), + 'passwd_again': passwd_again.val() + }, + success: function(data) { + if (data['success']) { + location.reload(true); + } else { + showError(data['error']); + } + } + }); + + return false; +}); \ No newline at end of file diff --git a/templates/snippets/myhome_extra_script.html b/templates/snippets/myhome_extra_script.html new file mode 100644 index 0000000000..f586af9284 --- /dev/null +++ b/templates/snippets/myhome_extra_script.html @@ -0,0 +1,130 @@ +$(function() { + //repo-share-form share-list autocomplete + var share_list = []; + {% for contact in contacts %} + share_list.push('{{ contact.contact_email }}'); + {% endfor %} + + {% for group in groups %} + share_list.push('{{ group.props.group_name }} <{{ group.props.creator_name }}>'); + {% endfor %} + + $(".repo-share-btn").click(function() { + $("#repo_id").val($(this).attr("data")); + $("#repo-share-form").modal({appendTo: "#main"}); + addAutocomplete('#email_or_group', '#repo-share-form', share_list); + }); + + //check before post + $('#share-submit-btn').click(function() { + if (!$.trim($('#email_or_group').attr('value'))) { + $('#repo-share-form .error').removeClass('hide'); + $('#simplemodal-container').css('height', $('#repo-share-form').height()); + return false; + } + }); + + addConfirmTo($('.repo-delete-btn')); + + addConfirmTo($('.unshare-btn'), '确定要取消共享？'); + + $(".download-btn").click(function() { + window.open('{{ SITE_ROOT }}seafile_access_check/?repo_id=' + $(this).attr('data')); + }); + +//show op images when mouse hover on + $("table tr:gt(0)").hover( + function() { + $(this).find('img').css('cursor', 'pointer').removeClass('vh'); + }, + function() { + $(this).find('img').addClass('vh'); + } + ); +}); + +//repo-create-form +$('#repo-create').hover( + function() { + $(this).css({'background-color': '#fff', 'cursor': 'pointer'}); + }, + function() { + $(this).css('background-color', '#f5f5f5'); + } +); +$('#repo-create').click(function() { + $('#repo-create-form').modal({appendTo: '#main', autoResize: true}); +}); +$('#encrypt-switch').click(function () { + if ($(this).attr('checked')) { + $('#repo-create-form input[type="password"]').attr('disabled', false).removeClass('input-disabled'); + } else { + $('#repo-create-form input[type="password"]').attr('disabled', true).addClass('input-disabled'); + } +}); +function showError(err) { + $('#repo-create-form .error').html(err).attr('class','error'); + $('#simplemodal-container').css('height', $('#repo-create-form').height()); +} +$('#repo-create-submit').click(function() { + var passwd = $('#repo-create-form input[name="passwd"]'), + passwd_again = $('#repo-create-form input[name="passwd_again"]'); + + if (!$('#repo-name').val()) { + showError('目录名不能为空。'); + return false; + } + if (!$('#repo-desc').val()) { + showError('描述不能为空。'); + return false; + } + + if ($('#encrypt-switch').attr('checked')) { + if (!passwd.val()) { + showError('密码不能为空。'); + return false; + } + if (!passwd_again.val()) { + showError('请确认密码。'); + return false; + } + if (passwd.val().length < 3) { + showError('密码太短。'); + return false; + } + if (passwd.val().length > 15) { + showError('密码太长。'); + return false; + } + if (passwd.val() != passwd_again.val()) { + showError('两次输入的密码不一致。'); + return false; + } + } + + $.ajax({ + url: '{{ url }}', + type: 'POST', + dataType: 'json', + cache: 'false', + contentType: 'application/json; charset=utf-8', + beforeSend: prepareCSRFToken, + data: { + 'repo_name': $('#repo-name').val(), + 'repo_desc': $('#repo-desc').val(), + 'encryption': $('#encrypt-switch').attr('checked') ? 1 : 0, + 'passwd': passwd.val(), + 'passwd_again': passwd_again.val() + }, + success: function(data) { + alert(data); + if (data['success']) { + location.reload(true); + } else { + showError(data['error']); + } + } + }); + + return false; +}); \ No newline at end of file diff --git a/templates/snippets/repo_create_form.html b/templates/snippets/repo_create_form.html new file mode 100644 index 0000000000..fa4adbfe5a --- /dev/null +++ b/templates/snippets/repo_create_form.html @@ -0,0 +1,16 @@ + diff --git a/templates/snippets/repo_share_form.html b/templates/snippets/repo_share_form.html new file mode 100644 index 0000000000..9cf7999100 --- /dev/null +++ b/templates/snippets/repo_share_form.html @@ -0,0 +1,9 @@ + diff --git a/thirdpart/seaserv/__init__.py b/thirdpart/seaserv/__init__.py index a17520a5b0..1bf41765d1 100644 --- a/thirdpart/seaserv/__init__.py +++ b/thirdpart/seaserv/__init__.py @@ -9,7 +9,8 @@ from service import get_binding_peerids from service import get_ccnetuser, get_emailusers from service import get_group_repoids, check_group_staff from service import create_org, get_orgs_by_user, get_org_by_url_prefix, \ - get_user_current_org, add_org_user, remove_org_user, get_org_by_id + get_user_current_org, add_org_user, remove_org_user, get_org_by_id, \ + is_valid_filename from service import CCNET_CONF_PATH diff --git a/thirdpart/seaserv/service.py b/thirdpart/seaserv/service.py index 6fff9f5a96..afe16eed0b 100644 --- a/thirdpart/seaserv/service.py +++ b/thirdpart/seaserv/service.py @@ -115,6 +115,14 @@ def get_emailusers(start, limit): # group.maintainers = group.props.maintainers.split(" ") # return group +def check_group_staff(group_id_int, user_or_username): + """Check where user is group staff""" + from seahub.base.accounts import CcnetUser + if isinstance(user_or_username, CcnetUser): + user_or_username = user_or_username.username + + return ccnet_threaded_rpc.check_group_staff(group_id_int, user_or_username) + def get_org_groups(org_id, start, limit): try: groups = ccnet_threaded_rpc.get_org_groups(org_id, 0, sys.maxint) @@ -198,6 +206,18 @@ def get_repos(): """ return seafserv_threaded_rpc.get_repo_list("", 100) +def create_org_repo(repo_name, repo_desc, user, passwd, org_id): + """ + Create org repo, return valid repo id if success. + """ + try: + repo_id = seafserv_threaded_rpc.create_org_repo(repo_name, repo_desc, + user, passwd, org_id) + except SearpcError: + repo_id = None + + return repo_id + def get_org_repos(org_id, start, limit): """ """ @@ -253,11 +273,13 @@ def get_group_repoids(group_id=None): repoid_list.append(repo_id) return repoid_list -def check_group_staff(group_id_int, user_or_username): - """Check where user is group staff""" - from seahub.base.accounts import CcnetUser - if isinstance(user_or_username, CcnetUser): - user_or_username = user_or_username.username - - return ccnet_threaded_rpc.check_group_staff(group_id_int, user_or_username) +def is_valid_filename(file_or_dir): + """ + Check whether file name or directory name is valid. + """ + try: + ret = seafserv_threaded_rpc.is_valid_filename('', file_or_dir) + except SearpcError: + ret = 0 + return ret diff --git a/views.py b/views.py index d830279670..d14a1f846f 100644 --- a/views.py +++ b/views.py @@ -28,7 +28,7 @@ from auth.forms import AuthenticationForm, PasswordResetForm, SetPasswordForm, \ from auth.tokens import default_token_generator from share.models import FileShare from seaserv import ccnet_rpc, ccnet_threaded_rpc, get_repos, get_emailusers, \ - get_repo, get_commits, get_branches, \ + get_repo, get_commits, get_branches, is_valid_filename, \ seafserv_threaded_rpc, seafserv_rpc, get_binding_peerids, get_ccnetuser, \ get_group_repoids, check_group_staff, get_personal_groups from pysearpc import SearpcError @@ -744,6 +744,7 @@ def myhome(request): "orgmsg_list": orgmsg_list, "groups_manage": groups_manage, "groups_join": groups_join, + "url": settings.SITE_ROOT + 'repo/create/', }, context_instance=RequestContext(request)) @login_required @@ -1596,7 +1597,7 @@ def repo_new_dir(request): return go_error (request, error_msg) try: - if not seafserv_threaded_rpc.is_valid_filename(repo_id, new_dir_name): + if not is_valid_filename(new_dir_name): error_msg = (u"您输入的目录名称 %s 包含非法字符" % new_dir_name) return go_error (request, error_msg) except SearpcError,e: @@ -1651,7 +1652,7 @@ def validate_filename(request): result = {'ret':'yes'} try: - ret = seafserv_threaded_rpc.is_valid_filename (repo_id, filename); + ret = is_valid_filename(filename); except SearpcError: result['ret'] = 'error' else: @@ -1681,7 +1682,7 @@ def repo_create(request): error_msg = u"目录名不能为空" elif len(repo_name) > 50: error_msg = u"目录名太长" - elif not seafserv_threaded_rpc.is_valid_filename('', repo_name): + elif not is_valid_filename(repo_name): error_msg = (u"您输入的目录名 %s 包含非法字符" % repo_name) elif not repo_desc: error_msg = u"描述不能为空"