diff --git a/group/views.py b/group/views.py index a40c94713b..3b1cfb0565 100644 --- a/group/views.py +++ b/group/views.py @@ -104,7 +104,8 @@ def render_group_info(request, group_id, form): for group in groups: if group.id == group_id_int: joined = True - if not joined and not request.user.is_staff: + if not joined and not request.user.is_staff and \ + not request.user.org.is_staff: return go_error(request, u'未加入该小组') group = ccnet_threaded_rpc.get_group(group_id_int) diff --git a/profile/urls.py b/profile/urls.py index d8ab4aa4a3..949b2bc1cd 100644 --- a/profile/urls.py +++ b/profile/urls.py @@ -5,5 +5,5 @@ urlpatterns = patterns('profile.views', url(r'^$', 'edit_profile', name="edit_profile"), url(r'^(?P[^/]+)/$', 'user_profile', name="user_profile"), url(r'^(?P[^/]+)/get/$', 'get_user_profile', name="get_user_profile"), - url(r'^logout/$', 'logout_relay', name="logout_relay"), +# url(r'^logout/$', 'logout_relay', name="logout_relay"), ) diff --git a/profile/views.py b/profile/views.py index 5d21efa8e6..f8c59e4444 100644 --- a/profile/views.py +++ b/profile/views.py @@ -26,15 +26,15 @@ from seahub.contacts.models import Contact # {'peers': peers}, # context_instance=RequestContext(request)) -def logout_relay(request): - peer_id = request.GET.get('peer_id', '') - - try: - ccnet_threaded_rpc.remove_one_binding(request.user.username, peer_id) - except SearpcError, e: - return go_error(request, e.msg) - - return HttpResponseRedirect(reverse('list_userids')) +#def logout_relay(request): +# peer_id = request.GET.get('peer_id', '') +# +# try: +# ccnet_threaded_rpc.remove_one_binding(request.user.username, peer_id) +# except SearpcError, e: +# return go_error(request, e.msg) +# +# return HttpResponseRedirect(reverse('list_userids')) @login_required def edit_profile(request): diff --git a/templates/userinfo.html b/templates/userinfo.html index a70e581cf4..e1a2d252d3 100644 --- a/templates/userinfo.html +++ b/templates/userinfo.html @@ -59,6 +59,7 @@

暂无

{% endif %} + {% endblock %} diff --git a/views.py b/views.py index 22896be59d..73c1053360 100644 --- a/views.py +++ b/views.py @@ -1091,26 +1091,26 @@ def user_info(request, email): if request.user.username == email: return HttpResponseRedirect(reverse(myhome)) - if not request.user.is_staff: + if not request.user.is_staff and not request.user.org.is_staff: return go_permission_error(request, u'权限不足:无法查看该用户信息') - user_dict = {} +# user_dict = {} owned_repos = [] quota_usage = 0 owned_repos = seafserv_threaded_rpc.list_owned_repos(email) quota_usage = seafserv_threaded_rpc.get_user_quota_usage(email) - try: - peers = ccnet_threaded_rpc.get_peers_by_email(email) - for peer in peers: - if not peer: - continue - peername = peer.props.name - roles = peer.props.role_list - user_dict[peername] = roles - except: - pass +# try: +# peers = ccnet_threaded_rpc.get_peers_by_email(email) +# for peer in peers: +# if not peer: +# continue +# peername = peer.props.name +# roles = peer.props.role_list +# user_dict[peername] = roles +# except: +# pass # Repos that are share to user in_repos = seafserv_threaded_rpc.list_share_repos(email, 'to_email', -1, -1) @@ -1120,7 +1120,7 @@ def user_info(request, email): 'owned_repos': owned_repos, 'quota_usage': quota_usage, "in_repos": in_repos, - 'user_dict': user_dict, +# 'user_dict': user_dict, 'email': email }, context_instance=RequestContext(request))