1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-04 16:31:13 +00:00

Fixed autocomplete bug when share repo

This commit is contained in:
zhengxie
2012-10-10 19:20:10 +08:00
parent be89036fcb
commit 3e0961ff90
2 changed files with 20 additions and 6 deletions

View File

@@ -120,7 +120,9 @@
{% block extra_script %} {% block extra_script %}
<script type="text/javascript"> <script type="text/javascript">
{% with groups=autocomp_groups %}
{% include "snippets/myhome_extra_script.html" %} {% include "snippets/myhome_extra_script.html" %}
{% endwith %}
{% url 'seahub.views.repo_create' as repo_create_url %} {% url 'seahub.views.repo_create' as repo_create_url %}
{% with post_url=repo_create_url %} {% with post_url=repo_create_url %}

View File

@@ -851,10 +851,6 @@ def myhome(request):
# Personal repos others shared to me # Personal repos others shared to me
in_repos = list_personal_shared_repos(email,'to_email', -1, -1) in_repos = list_personal_shared_repos(email,'to_email', -1, -1)
# Get registered contacts used in autocomplete.
contacts = [ c for c in Contact.objects.filter(user_email=email) \
if is_registered_user(c.contact_email) ]
# user notifications # user notifications
grpmsg_list = [] grpmsg_list = []
grpmsg_reply_list = [] grpmsg_reply_list = []
@@ -871,7 +867,7 @@ def myhome(request):
elif n.msg_type == 'org_join_msg': elif n.msg_type == 'org_join_msg':
orgmsg_list.append(n.detail) orgmsg_list.append(n.detail)
# Get all personal groups I joined used in autocomplete. # Get all personal groups I joined.
joined_groups = get_personal_groups_by_user(request.user.username) joined_groups = get_personal_groups_by_user(request.user.username)
# get nickname # get nickname
@@ -886,6 +882,22 @@ def myhome(request):
except: except:
CLOUD_MODE = False CLOUD_MODE = False
if CLOUD_MODE:
# In cloud mode, list joined groups and registered contacts for
# autocompletion.
autocomp_groups = joined_groups
contacts = [ c for c in Contact.objects.filter(user_email=email) \
if is_registered_user(c.contact_email) ]
else:
# List all personal groups and all registered users for autocompletion.
autocomp_groups = get_personal_groups(-1, -1)
contacts = []
for u in get_emailusers(-1, -1):
if u.email == request.user.username:
continue
u.contact_email = u.email
contacts.append(u)
allow_public_share = True if not CLOUD_MODE else False allow_public_share = True if not CLOUD_MODE else False
# events # events
@@ -908,8 +920,8 @@ def myhome(request):
"quota_usage": quota_usage, "quota_usage": quota_usage,
"in_repos": in_repos, "in_repos": in_repos,
"contacts": contacts, "contacts": contacts,
"groups": joined_groups,
"joined_groups": joined_groups, "joined_groups": joined_groups,
"autocomp_groups": autocomp_groups,
"notes": notes, "notes": notes,
"grpmsg_list": grpmsg_list, "grpmsg_list": grpmsg_list,
"grpmsg_reply_list": grpmsg_reply_list, "grpmsg_reply_list": grpmsg_reply_list,