haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-19 01:44:13 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1312 from haiwen/accounts

Browse Source 
add `LDAPImport` scope when get accounts
This commit is contained in:
Daniel Pan
2016-08-04 14:52:03 +08:00
committed by GitHub
parent 15d082a8c5 3fff8e64c4
commit 72efe4f8ea
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
seahub/api2/views.py
View File

@@ -219,14 +219,17 @@ class Accounts(APIView):
# reading scope user list
scope = request.GET.get('scope', None)
accounts_ldapimport = []
accounts_ldap = []
accounts_db = []
if scope:
scope = scope.upper()
if scope == 'LDAP':
accounts_ldap = seaserv.get_emailusers('LDAP', start, limit)
accounts_ldap = ccnet_api.get_emailusers('LDAP', start, limit)
elif scope == 'LDAPIMPORT':
accounts_ldapimport = ccnet_api.get_emailusers('LDAPImport', start, limit)
elif scope == 'DB':
accounts_db = seaserv.get_emailusers('DB', start, limit)
accounts_db = ccnet_api.get_emailusers('DB', start, limit)
else:
return api_error(status.HTTP_400_BAD_REQUEST, "%s is not a valid scope value" % scope)
else:
@@ -238,6 +241,10 @@ class Accounts(APIView):
accounts_json = []
for account in accounts_ldap:
accounts_json.append({'email': account.email, 'source' : 'LDAP'})
for account in accounts_ldapimport:
accounts_json.append({'email': account.email, 'source' : 'LDAPImport'})
for account in accounts_db:
accounts_json.append({'email': account.email, 'source' : 'DB'})