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

Merge branch '3.1'

Browse Source
This commit is contained in:
zhengxie
2014-10-13 14:40:57 +08:00
parent 632f9ba607 7e41c11129
commit 0bd08df98a
5 changed files with 59 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
seahub/views/sysadmin.py
View File

@@ -318,7 +318,6 @@ def sys_user_admin_admins(request):
@login_required
@sys_staff_required
def user_info(request, email):
owned_repos = seafile_api.get_owned_repo_list(email)
quota = seafile_api.get_user_quota(email)
@@ -822,16 +821,16 @@ def user_search(request):
"""Search a user.
"""
email = request.GET.get('email', '')
email_patt = email.replace('*', '%')
users = ccnet_threaded_rpc.search_emailusers(email_patt, -1, -1)
users = ccnet_threaded_rpc.search_emailusers(email, -1, -1)
last_logins = UserLastLogin.objects.filter(username__in=[x.email for x in users])
for user in users:
try:
user.self_usage = seafile_api.get_user_self_usage(user.email)
user.share_usage = seafile_api.get_user_share_usage(user.email)
user.quota = seafile_api.get_user_quota(user.email)
except:
except SearpcError as e:
logger.error(e)
user.self_usage = -1
user.share_usage = -1
user.quota = -1