From b187acdb13b40080796f1964192a262b0927d34b Mon Sep 17 00:00:00 2001 From: xiez Date: Fri, 3 Aug 2012 14:00:43 +0800 Subject: [PATCH] Add autocomplete when send file shared link --- group/views.py | 4 ++-- templates/repo_view_file.html | 8 ++++++++ views.py | 11 ++++------- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/group/views.py b/group/views.py index 9a879d2801..27e30a5d1d 100644 --- a/group/views.py +++ b/group/views.py @@ -392,7 +392,7 @@ def group_members(request, group_id): email=member_name) if not ccnet_threaded_rpc.org_user_exists(request.user.org['org_id'], member_name): - err_msg = u'当前企业不存在 %s 用户' % member_name + err_msg = u'无法添加成员,当前企业不存在 %s 用户' % member_name return render_error(request, err_msg) else: try: @@ -408,7 +408,7 @@ def group_members(request, group_id): email=member_name) if not validate_emailuser(member_name): - err_msg = u'用户 %s 不存在' % member_name + err_msg = u'无法添加成员,用户 %s 不存在' % member_name return render_error(request, err_msg) else: try: diff --git a/templates/repo_view_file.html b/templates/repo_view_file.html index 22a5ae5bca..202daea004 100644 --- a/templates/repo_view_file.html +++ b/templates/repo_view_file.html @@ -76,6 +76,7 @@ function hideLink() { $('#get-shared-link').removeClass('hide'); } + $(window).load(function() { var view_history = '{{ view_history }}', url = '', @@ -136,6 +137,13 @@ $('#rm-shared-link').click(function() { $('#send-shared-link').click(function() { $("#link-send-form").modal({appendTo: "#main"}); + + // link-send-form email autocomplete + var share_list = []; + {% for contact in contacts %} + share_list.push('{{ contact.contact_email }}'); + {% endfor %} + addAutocomplete('#email', '#link-send-form', share_list); }); $("#link-send-form").submit(function(event) { diff --git a/views.py b/views.py index 5945149644..1fc798101e 100644 --- a/views.py +++ b/views.py @@ -157,12 +157,6 @@ def render_repo(request, repo_id, error=''): can_access = access_to_repo(request, repo_id, '') if not can_access: return render_permission_error(request, '无法访问该同步目录') - - # Check whether use is repo owner - # if validate_owner(request, repo_id): - # is_owner = True - # else: - # is_owner = False repo = get_repo(repo_id) if not repo: @@ -238,7 +232,6 @@ def render_repo(request, repo_id, error=''): "can_access": can_access, "current_commit": current_commit, "view_history": view_history, - # "is_owner": is_owner, "password_set": password_set, "repo_size": repo_size, "dir_list": dir_list, @@ -823,6 +816,9 @@ def repo_view_file(request, repo_id): else: file_shared_link = '' + # my constacts + contacts = Contact.objects.filter(user_email=request.user.username) + return render_to_response('repo_view_file.html', { 'repo': repo, 'path': path, @@ -841,6 +837,7 @@ def repo_view_file(request, repo_id): 'protocol': http_or_https, 'domain': domain, 'file_shared_link': file_shared_link, + 'contacts': contacts, }, context_instance=RequestContext(request)) def repo_file_get(request, repo_id):