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

Update get_emailusers rpc

Browse Source
This commit is contained in:
zhengxie
2015-10-24 17:18:07 +08:00
parent f9fd818df8
commit 7e42e9b8b2
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
seahub/views/sysadmin.py
View File

@@ -16,7 +16,8 @@ from django.template import RequestContext
from django.utils import timezone from django.utils import timezone
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from seaserv import ccnet_threaded_rpc, seafserv_threaded_rpc, get_emailusers, \ import seaserv
from seaserv import ccnet_threaded_rpc, seafserv_threaded_rpc, \
CALC_SHARE_USAGE, seafile_api, get_group, get_group_members CALC_SHARE_USAGE, seafile_api, get_group, get_group_members
from pysearpc import SearpcError from pysearpc import SearpcError
@@ -403,7 +404,8 @@ def sys_user_admin(request):
except ValueError: except ValueError:
current_page = 1 current_page = 1
per_page = 25 per_page = 25
users_plus_one = get_emailusers('DB', per_page * (current_page - 1), per_page + 1) users_plus_one = seaserv.get_emailusers('DB', per_page * (current_page - 1),
per_page + 1)
if len(users_plus_one) == per_page + 1: if len(users_plus_one) == per_page + 1:
page_next = True page_next = True
else: else:
@@ -438,7 +440,7 @@ def sys_user_admin(request):
if trial_user.user_or_org == user.email: if trial_user.user_or_org == user.email:
user.trial_info = {'expire_date': trial_user.expire_date} user.trial_info = {'expire_date': trial_user.expire_date}
have_ldap = True if len(get_emailusers('LDAP', 0, 1)) > 0 else False have_ldap = True if len(seaserv.get_emailusers('LDAP', 0, 1)) > 0 else False
platform = get_platform_name() platform = get_platform_name()
server_id = get_server_id() server_id = get_server_id()
@@ -475,7 +477,9 @@ def sys_user_admin_ldap_imported(request):
except ValueError: except ValueError:
current_page = 1 current_page = 1
per_page = 25 per_page = 25
users_plus_one = get_emailusers('LDAPImport', per_page * (current_page - 1), per_page + 1) users_plus_one = seaserv.get_emailusers('LDAPImport',
per_page * (current_page - 1),
per_page + 1)
if len(users_plus_one) == per_page + 1: if len(users_plus_one) == per_page + 1:
page_next = True page_next = True
else: else:
@@ -519,7 +523,9 @@ def sys_user_admin_ldap(request):
except ValueError: except ValueError:
current_page = 1 current_page = 1
per_page = 25 per_page = 25
users_plus_one = get_emailusers('LDAP', per_page * (current_page - 1), per_page + 1) users_plus_one = seaserv.get_emailusers('LDAP',
per_page * (current_page - 1),
per_page + 1)
if len(users_plus_one) == per_page + 1: if len(users_plus_one) == per_page + 1:
page_next = True page_next = True
else: else:
@@ -557,8 +563,8 @@ def sys_user_admin_ldap(request):
def sys_user_admin_admins(request): def sys_user_admin_admins(request):
"""List all admins from database and ldap imported """List all admins from database and ldap imported
""" """
db_users = get_emailusers('DB', -1, -1) db_users = seaserv.get_emailusers('DB', -1, -1)
ldpa_imported_users = get_emailusers('LDAPImport', -1, -1) ldpa_imported_users = seaserv.get_emailusers('LDAPImport', -1, -1)
admin_users = [] admin_users = []
not_admin_users = [] not_admin_users = []
@@ -590,7 +596,7 @@ def sys_user_admin_admins(request):
if last_login.username == user.email: if last_login.username == user.email:
user.last_login = last_login.last_login user.last_login = last_login.last_login
have_ldap = True if len(get_emailusers('LDAP', 0, 1)) > 0 else False have_ldap = True if len(seaserv.get_emailusers('LDAP', 0, 1)) > 0 else False
return render_to_response( return render_to_response(
'sysadmin/sys_useradmin_admins.html', { 'sysadmin/sys_useradmin_admins.html', {