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

[syadmin] add "Name" and "Contact Email" when export users to excel

Browse Source
This commit is contained in:
lian
2016-08-09 11:17:38 +08:00
parent e48ae64576
commit b74bc6fd2a
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
seahub/views/sysadmin.py
View File

@@ -113,7 +113,7 @@ def can_view_sys_admin_repo(repo):
return False return False
def populate_user_info(user): def populate_user_info(user):
"""Populate contact email and nickname to user. """Populate contact email and name to user.
""" """
user_profile = Profile.objects.get_profile_by_user(user.email) user_profile = Profile.objects.get_profile_by_user(user.email)
if user_profile: if user_profile:
@@ -259,8 +259,8 @@ def sys_useradmin_export_excel(request):
next = SITE_ROOT next = SITE_ROOT
try: try:
users = seaserv.get_emailusers('DB', -1, -1) + \ users = ccnet_api.get_emailusers('DB', -1, -1) + \
seaserv.get_emailusers('LDAPImport', -1, -1) ccnet_api.get_emailusers('LDAPImport', -1, -1)
except Exception as e: except Exception as e:
logger.error(e) logger.error(e)
messages.error(request, _(u'Failed to export Excel')) messages.error(request, _(u'Failed to export Excel'))
@@ -272,16 +272,21 @@ def sys_useradmin_export_excel(request):
is_pro = False is_pro = False
if is_pro: if is_pro:
head = [_("Email"), _("Status"), _("Role"), _("Create At"), head = [_("Email"), _("Name"), _("Contact Email"), _("Status"),
_("Last Login"), _("Admin"), _("LDAP(imported)"),] _("Role"), _("Create At"), _("Last Login"), _("Admin"),
_("LDAP(imported)"),]
else: else:
head = [_("Email"), _("Status"), _("Create At"), head = [_("Email"), _("Name"), _("Contact Email"), _("Status"),
_("Last Login"), _("Admin"), _("LDAP(imported)"),] _("Create At"), _("Last Login"), _("Admin"), _("LDAP(imported)"),]
data_list = [] data_list = []
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:
# populate name and contact email
populate_user_info(user)
# populate user last login time # populate user last login time
user.last_login = None user.last_login = None
for last_login in last_logins: for last_login in last_logins:
@@ -306,11 +311,11 @@ def sys_useradmin_export_excel(request):
else: else:
role = _('Default') role = _('Default')
row = [user.email, status, role, create_at, row = [user.email, user.name, user.contact_email, status,
last_login, is_admin, ldap_import] role, create_at, last_login, is_admin, ldap_import]
else: else:
row = [user.email, status, create_at, last_login, row = [user.email, user.name, user.contact_email, status,
is_admin, ldap_import] create_at, last_login, is_admin, ldap_import]
data_list.append(row) data_list.append(row)