diff --git a/templates/myhome.html b/templates/myhome.html index d38c68c912..e50032dcb7 100644 --- a/templates/myhome.html +++ b/templates/myhome.html @@ -34,22 +34,23 @@

暂无

{% endif %} -

我获取的同步目录

-{% if fetched_repos %} +

共享给我的同步目录

+{% if in_repos %} - - + + + - {% for repo in fetched_repos %} + {% for repo in in_repos %} - + + {% endfor %} diff --git a/templates/share_repos.html b/templates/share_repos.html index 74efb87b26..6827caf805 100644 --- a/templates/share_repos.html +++ b/templates/share_repos.html @@ -27,30 +27,6 @@

暂无

{% endif %} -

共享给我的同步目录

-{% if in_repos %} -
名字描述操作共享来源描述操作
{{ repo.props.name }}{{ repo.props.name }}{{ repo.props.shared_email }} {{ repo.props.desc }} - - +
- - - - - - - - {% for repo in in_repos %} - - - - - - - {% endfor %} -
名字共享来源描述操作
{{ repo.props.name }}{{ repo.props.shared_email }}{{ repo.props.desc }} - -
-{% else %} -

暂无

-{% endif %} {% endblock %} {% block extra_script %} diff --git a/views.py b/views.py index 56dcc34b19..21c4988fca 100644 --- a/views.py +++ b/views.py @@ -259,7 +259,7 @@ def remove_fetched_repo(request, user_id, repo_id): @login_required def myhome(request): owned_repos = [] - fetched_repos = [] +# fetched_repos = [] quota_usage = 0 userid_list = get_binding_userids(request.user.username) @@ -268,18 +268,22 @@ def myhome(request): owned_repos.extend(seafserv_threaded_rpc.list_owned_repos(user_id)) quota_usage = quota_usage + seafserv_threaded_rpc.get_user_quota_usage(user_id) - frepos = seafserv_threaded_rpc.list_fetched_repos(user_id) - for repo in frepos: - repo.userid = user_id # associate a fetched repo with the user id - - fetched_repos.extend(frepos) +# frepos = seafserv_threaded_rpc.list_fetched_repos(user_id) +# for repo in frepos: +# repo.userid = user_id # associate a fetched repo with the user id +# +# fetched_repos.extend(frepos) except: pass + # Repos that are share to me + in_repos = seafserv_threaded_rpc.list_share_repos(request.user.username, 'to_email', -1, -1) + return render_to_response('myhome.html', { "owned_repos": owned_repos, "quota_usage": quota_usage, - "fetched_repos": fetched_repos, +# "fetched_repos": fetched_repos, + "in_repos": in_repos, }, context_instance=RequestContext(request)) @login_required @@ -390,11 +394,11 @@ def repo_list_share(request): username = request.user.username out_repos = seafserv_threaded_rpc.list_share_repos(username, 'from_email', -1, -1) - in_repos = seafserv_threaded_rpc.list_share_repos(username, 'to_email', -1, -1) +# in_repos = seafserv_threaded_rpc.list_share_repos(username, 'to_email', -1, -1) return render_to_response('share_repos.html', { "out_repos": out_repos, - "in_repos": in_repos, +# "in_repos": in_repos, }, context_instance=RequestContext(request)) @login_required