haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-20 02:48:51 +00:00
Code Issues Releases Wiki Activity

[sysadmin] Show org name when list users

Browse Source
This commit is contained in:
zhengxie
2014-10-17 11:20:11 +08:00
parent 163302e809
commit cd50da0cb8
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
seahub/templates/sysadmin/useradmin_table.html
View File

@@ -11,7 +11,11 @@
{% for user in users %} {% for user in users %}
<tr data-userid="{{user.email}}"> <tr data-userid="{{user.email}}">
<td><a href="{{ SITE_ROOT }}useradmin/info/{{ user.props.email }}/">{{ user.email }}</a></td> <td><a href="{{ SITE_ROOT }}useradmin/info/{{ user.props.email }}/">{{ user.email }}</a>
{% if user.org %}
<p style="font-size:11px;"><a href="{% url 'sys_org_info' user.org.org_id %}">({{user.org.org_name}})</a></p>
{% endif %}
</td>
<td> <td>
{% if user.source != 'LDAP' %} {% if user.source != 'LDAP' %}
<div class="user-status"> <div class="user-status">

17
seahub/views/sysadmin.py
View File

@@ -181,7 +181,8 @@ def sys_user_admin(request):
user.share_usage = seafile_api.get_user_share_usage(user.email) user.share_usage = seafile_api.get_user_share_usage(user.email)
user.quota = seafile_api.get_user_quota(user.email) user.quota = seafile_api.get_user_quota(user.email)
else: else:
org_id = org[0].org_id user.org = org[0]
org_id = user.org.org_id
user.self_usage = seafserv_threaded_rpc.get_org_user_quota_usage(org_id, user.email) user.self_usage = seafserv_threaded_rpc.get_org_user_quota_usage(org_id, user.email)
user.share_usage = 0 #seafile_api.get_user_share_usage(user.email) user.share_usage = 0 #seafile_api.get_user_share_usage(user.email)
user.quota = seafserv_threaded_rpc.get_org_user_quota(org_id, user.email) user.quota = seafserv_threaded_rpc.get_org_user_quota(org_id, user.email)
@@ -879,10 +880,18 @@ def user_search(request):
users = ccnet_threaded_rpc.search_emailusers(email, -1, -1) users = ccnet_threaded_rpc.search_emailusers(email, -1, -1)
last_logins = UserLastLogin.objects.filter(username__in=[x.email for x in users]) last_logins = UserLastLogin.objects.filter(username__in=[x.email for x in users])
for user in users: for user in users:
org = ccnet_threaded_rpc.get_orgs_by_user(user.email)
try: try:
user.self_usage = seafile_api.get_user_self_usage(user.email) if not org:
user.share_usage = seafile_api.get_user_share_usage(user.email) user.self_usage = seafile_api.get_user_self_usage(user.email)
user.quota = seafile_api.get_user_quota(user.email) user.share_usage = seafile_api.get_user_share_usage(user.email)
user.quota = seafile_api.get_user_quota(user.email)
else:
user.org = org[0]
org_id = user.org.org_id
user.self_usage = seafserv_threaded_rpc.get_org_user_quota_usage(org_id, user.email)
user.share_usage = 0
user.quota = seafserv_threaded_rpc.get_org_user_quota(org_id, user.email)
except SearpcError as e: except SearpcError as e:
logger.error(e) logger.error(e)
user.self_usage = -1 user.self_usage = -1