mirror of
https://github.com/haiwen/seahub.git
synced 2025-09-04 00:20:07 +00:00
Add autocomplete when send file shared link
This commit is contained in:
@@ -392,7 +392,7 @@ def group_members(request, group_id):
|
|||||||
email=member_name)
|
email=member_name)
|
||||||
if not ccnet_threaded_rpc.org_user_exists(request.user.org['org_id'],
|
if not ccnet_threaded_rpc.org_user_exists(request.user.org['org_id'],
|
||||||
member_name):
|
member_name):
|
||||||
err_msg = u'当前企业不存在 %s 用户' % member_name
|
err_msg = u'无法添加成员,当前企业不存在 %s 用户' % member_name
|
||||||
return render_error(request, err_msg)
|
return render_error(request, err_msg)
|
||||||
else:
|
else:
|
||||||
try:
|
try:
|
||||||
@@ -408,7 +408,7 @@ def group_members(request, group_id):
|
|||||||
email=member_name)
|
email=member_name)
|
||||||
|
|
||||||
if not validate_emailuser(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)
|
return render_error(request, err_msg)
|
||||||
else:
|
else:
|
||||||
try:
|
try:
|
||||||
|
@@ -76,6 +76,7 @@ function hideLink() {
|
|||||||
$('#get-shared-link').removeClass('hide');
|
$('#get-shared-link').removeClass('hide');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$(window).load(function() {
|
$(window).load(function() {
|
||||||
var view_history = '{{ view_history }}',
|
var view_history = '{{ view_history }}',
|
||||||
url = '',
|
url = '',
|
||||||
@@ -136,6 +137,13 @@ $('#rm-shared-link').click(function() {
|
|||||||
|
|
||||||
$('#send-shared-link').click(function() {
|
$('#send-shared-link').click(function() {
|
||||||
$("#link-send-form").modal({appendTo: "#main"});
|
$("#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) {
|
$("#link-send-form").submit(function(event) {
|
||||||
|
11
views.py
11
views.py
@@ -157,12 +157,6 @@ def render_repo(request, repo_id, error=''):
|
|||||||
can_access = access_to_repo(request, repo_id, '')
|
can_access = access_to_repo(request, repo_id, '')
|
||||||
if not can_access:
|
if not can_access:
|
||||||
return render_permission_error(request, '无法访问该同步目录')
|
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)
|
repo = get_repo(repo_id)
|
||||||
if not repo:
|
if not repo:
|
||||||
@@ -238,7 +232,6 @@ def render_repo(request, repo_id, error=''):
|
|||||||
"can_access": can_access,
|
"can_access": can_access,
|
||||||
"current_commit": current_commit,
|
"current_commit": current_commit,
|
||||||
"view_history": view_history,
|
"view_history": view_history,
|
||||||
# "is_owner": is_owner,
|
|
||||||
"password_set": password_set,
|
"password_set": password_set,
|
||||||
"repo_size": repo_size,
|
"repo_size": repo_size,
|
||||||
"dir_list": dir_list,
|
"dir_list": dir_list,
|
||||||
@@ -823,6 +816,9 @@ def repo_view_file(request, repo_id):
|
|||||||
else:
|
else:
|
||||||
file_shared_link = ''
|
file_shared_link = ''
|
||||||
|
|
||||||
|
# my constacts
|
||||||
|
contacts = Contact.objects.filter(user_email=request.user.username)
|
||||||
|
|
||||||
return render_to_response('repo_view_file.html', {
|
return render_to_response('repo_view_file.html', {
|
||||||
'repo': repo,
|
'repo': repo,
|
||||||
'path': path,
|
'path': path,
|
||||||
@@ -841,6 +837,7 @@ def repo_view_file(request, repo_id):
|
|||||||
'protocol': http_or_https,
|
'protocol': http_or_https,
|
||||||
'domain': domain,
|
'domain': domain,
|
||||||
'file_shared_link': file_shared_link,
|
'file_shared_link': file_shared_link,
|
||||||
|
'contacts': contacts,
|
||||||
}, context_instance=RequestContext(request))
|
}, context_instance=RequestContext(request))
|
||||||
|
|
||||||
def repo_file_get(request, repo_id):
|
def repo_file_get(request, repo_id):
|
||||||
|
Reference in New Issue
Block a user