diff --git a/templates/myhome.html b/templates/myhome.html index c1fe0a1fed..2d02c9ae4b 100644 --- a/templates/myhome.html +++ b/templates/myhome.html @@ -14,7 +14,12 @@ {% endif %} +{% if not owner %}

我的同步目录

+{% else %} +

{{ owner }}的同步目录

+{% endif %} + @@ -33,7 +38,11 @@ {% endfor %}
名字
+{% if not owner %}

我用过的同步目录

+{% else %} +

{{ owner }}用过的同步目录

+{% endif %} diff --git a/templates/repos.html b/templates/repos.html index d2bc9b87af..ec7898d07b 100644 --- a/templates/repos.html +++ b/templates/repos.html @@ -14,7 +14,7 @@ {% for repo in repos %} - + diff --git a/urls.py b/urls.py index 8b59d4dd2e..29cefaf8af 100644 --- a/urls.py +++ b/urls.py @@ -4,7 +4,8 @@ from django.views.generic.simple import direct_to_template from seahub.views import root, peers, groups, myhome, \ repo, group, modify_token, remove_repo, seafadmin, useradmin, \ - role_add, role_remove, activate_user, user_add, user_remove + role_add, role_remove, activate_user, user_add, user_remove, \ + ownerhome # Uncomment the next two lines to enable the admin: from django.contrib import admin @@ -25,6 +26,7 @@ urlpatterns = patterns('', (r'^$', root), url(r'^home/my/$', myhome, name='myhome'), + url(r'^home/owner/(?P[^/]+)/$', ownerhome, name='ownerhome'), (r'^download/$', direct_to_template, { 'template': 'download.html' } ), (r'^repo/(?P[^/]+)/$', repo), (r'^repo/token/modify/(?P[^/]+)/$', modify_token), diff --git a/views.py b/views.py index 6ee9d0773b..d7bdf49936 100644 --- a/views.py +++ b/views.py @@ -163,12 +163,30 @@ def myhome(request): "fetched_repos": fetched_repos, }, context_instance=RequestContext(request)) +@login_required +def ownerhome(request, owner_id): + owned_repos = [] + fetched_repos = [] + quota_usage = 0 + + owner = request.GET.get('owner') + if owner_id: + owned_repos = seafserv_threaded_rpc.list_owned_repos(owner_id) + quota_usage = seafserv_threaded_rpc.get_user_quota_usage(owner_id) + fetched_repos = seafserv_threaded_rpc.list_fetched_repos(owner_id) + + return render_to_response('myhome.html', { + "owned_repos": owned_repos, + "quota_usage": quota_usage, + "fetched_repos": fetched_repos, + "owner": owner, + }, context_instance=RequestContext(request)) + @login_required def mypeers(request): cid = get_user_cid(request.user) - @login_required def seafadmin(request): if not request.user.is_staff: @@ -195,6 +213,7 @@ def seafadmin(request): owner_id = seafserv_threaded_rpc.get_repo_owner(repo.props.id) owner = UserProfile.objects.get(ccnet_user_id=owner_id).user repo.owner = owner.email + repo.owner_id = owner_id except: repo.owner = None
名字
{{ repo.props.name }}{{ repo.owner}}{{ repo.owner}} {{ repo.props.id }} {{ repo.props.desc }} 删除