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

Seperate DB and LDAP when search users

Browse Source
This commit is contained in:
lian
2015-06-16 10:39:49 +08:00
parent 9b903cbaf2
commit c60676d5dc
2 changed files with 85 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
seahub/views/sysadmin.py
View File

@@ -1279,7 +1279,10 @@ def user_search(request):
"""
email = request.GET.get('email', '')
users = ccnet_threaded_rpc.search_emailusers(email, -1, -1)
users = ccnet_threaded_rpc.search_emailusers('DB', email, -1, -1)
ldap_users = ccnet_threaded_rpc.search_emailusers('LDAP', email, -1, -1)
users.extend(ldap_users)
last_logins = UserLastLogin.objects.filter(username__in=[x.email for x in users])
if ENABLE_TRIAL_ACCOUNT:
trial_users = TrialAccount.objects.filter(user_or_org__in=[x.email for x in users])