mirror of
https://github.com/haiwen/seahub.git
synced 2025-09-02 23:48:47 +00:00
Enable admin to see user's repo on seafadmin page
This commit is contained in:
@@ -14,7 +14,12 @@
|
|||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
{% if not owner %}
|
||||||
<h3>我的同步目录</h3>
|
<h3>我的同步目录</h3>
|
||||||
|
{% else %}
|
||||||
|
<h3>{{ owner }}的同步目录</h3>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
<table class="repo-list default">
|
<table class="repo-list default">
|
||||||
<tr>
|
<tr>
|
||||||
<th>名字</th>
|
<th>名字</th>
|
||||||
@@ -33,7 +38,11 @@
|
|||||||
{% endfor %}
|
{% endfor %}
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
{% if not owner %}
|
||||||
<h3>我用过的同步目录</h3>
|
<h3>我用过的同步目录</h3>
|
||||||
|
{% else %}
|
||||||
|
<h3>{{ owner }}用过的同步目录</h3>
|
||||||
|
{% endif %}
|
||||||
<table class="repo-list default">
|
<table class="repo-list default">
|
||||||
<tr>
|
<tr>
|
||||||
<th>名字</th>
|
<th>名字</th>
|
||||||
|
@@ -14,7 +14,7 @@
|
|||||||
{% for repo in repos %}
|
{% for repo in repos %}
|
||||||
<tr>
|
<tr>
|
||||||
<td><a href="{{ SITE_ROOT }}repo/{{ repo.props.id }}/">{{ repo.props.name }}</a></td>
|
<td><a href="{{ SITE_ROOT }}repo/{{ repo.props.id }}/">{{ repo.props.name }}</a></td>
|
||||||
<td>{{ repo.owner}}</td>
|
<td><a href="{{ SITE_ROOT }}home/owner/{{ repo.owner_id }}/?owner={{ repo.owner }}">{{ repo.owner}}</a></td>
|
||||||
<td>{{ repo.props.id }}</td>
|
<td>{{ repo.props.id }}</td>
|
||||||
<td>{{ repo.props.desc }}</td>
|
<td>{{ repo.props.desc }}</td>
|
||||||
<td><a href="{{ SITE_ROOT }}repo/remove/{{ repo.props.id }}/">删除</a></td>
|
<td><a href="{{ SITE_ROOT }}repo/remove/{{ repo.props.id }}/">删除</a></td>
|
||||||
|
4
urls.py
4
urls.py
@@ -4,7 +4,8 @@ from django.views.generic.simple import direct_to_template
|
|||||||
|
|
||||||
from seahub.views import root, peers, groups, myhome, \
|
from seahub.views import root, peers, groups, myhome, \
|
||||||
repo, group, modify_token, remove_repo, seafadmin, useradmin, \
|
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:
|
# Uncomment the next two lines to enable the admin:
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
@@ -25,6 +26,7 @@ urlpatterns = patterns('',
|
|||||||
|
|
||||||
(r'^$', root),
|
(r'^$', root),
|
||||||
url(r'^home/my/$', myhome, name='myhome'),
|
url(r'^home/my/$', myhome, name='myhome'),
|
||||||
|
url(r'^home/owner/(?P<owner_id>[^/]+)/$', ownerhome, name='ownerhome'),
|
||||||
(r'^download/$', direct_to_template, { 'template': 'download.html' } ),
|
(r'^download/$', direct_to_template, { 'template': 'download.html' } ),
|
||||||
(r'^repo/(?P<repo_id>[^/]+)/$', repo),
|
(r'^repo/(?P<repo_id>[^/]+)/$', repo),
|
||||||
(r'^repo/token/modify/(?P<repo_id>[^/]+)/$', modify_token),
|
(r'^repo/token/modify/(?P<repo_id>[^/]+)/$', modify_token),
|
||||||
|
21
views.py
21
views.py
@@ -163,12 +163,30 @@ def myhome(request):
|
|||||||
"fetched_repos": fetched_repos,
|
"fetched_repos": fetched_repos,
|
||||||
}, context_instance=RequestContext(request))
|
}, 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
|
@login_required
|
||||||
def mypeers(request):
|
def mypeers(request):
|
||||||
cid = get_user_cid(request.user)
|
cid = get_user_cid(request.user)
|
||||||
|
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
def seafadmin(request):
|
def seafadmin(request):
|
||||||
if not request.user.is_staff:
|
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_id = seafserv_threaded_rpc.get_repo_owner(repo.props.id)
|
||||||
owner = UserProfile.objects.get(ccnet_user_id=owner_id).user
|
owner = UserProfile.objects.get(ccnet_user_id=owner_id).user
|
||||||
repo.owner = owner.email
|
repo.owner = owner.email
|
||||||
|
repo.owner_id = owner_id
|
||||||
except:
|
except:
|
||||||
repo.owner = None
|
repo.owner = None
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user