From b74bc6fd2af37f8771a4b8583fdeca166b287654 Mon Sep 17 00:00:00 2001 From: lian Date: Tue, 9 Aug 2016 11:17:38 +0800 Subject: [PATCH] [syadmin] add "Name" and "Contact Email" when export users to excel --- seahub/views/sysadmin.py | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/seahub/views/sysadmin.py b/seahub/views/sysadmin.py index c6d4f9f5e2..6a131ad1c4 100644 --- a/seahub/views/sysadmin.py +++ b/seahub/views/sysadmin.py @@ -113,7 +113,7 @@ def can_view_sys_admin_repo(repo): return False 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) if user_profile: @@ -259,8 +259,8 @@ def sys_useradmin_export_excel(request): next = SITE_ROOT try: - users = seaserv.get_emailusers('DB', -1, -1) + \ - seaserv.get_emailusers('LDAPImport', -1, -1) + users = ccnet_api.get_emailusers('DB', -1, -1) + \ + ccnet_api.get_emailusers('LDAPImport', -1, -1) except Exception as e: logger.error(e) messages.error(request, _(u'Failed to export Excel')) @@ -272,16 +272,21 @@ def sys_useradmin_export_excel(request): is_pro = False if is_pro: - head = [_("Email"), _("Status"), _("Role"), _("Create At"), - _("Last Login"), _("Admin"), _("LDAP(imported)"),] + head = [_("Email"), _("Name"), _("Contact Email"), _("Status"), + _("Role"), _("Create At"), _("Last Login"), _("Admin"), + _("LDAP(imported)"),] else: - head = [_("Email"), _("Status"), _("Create At"), - _("Last Login"), _("Admin"), _("LDAP(imported)"),] + head = [_("Email"), _("Name"), _("Contact Email"), _("Status"), + _("Create At"), _("Last Login"), _("Admin"), _("LDAP(imported)"),] data_list = [] last_logins = UserLastLogin.objects.filter(username__in=[x.email for x in users]) for user in users: + + # populate name and contact email + populate_user_info(user) + # populate user last login time user.last_login = None for last_login in last_logins: @@ -306,11 +311,11 @@ def sys_useradmin_export_excel(request): else: role = _('Default') - row = [user.email, status, role, create_at, - last_login, is_admin, ldap_import] + row = [user.email, user.name, user.contact_email, status, + role, create_at, last_login, is_admin, ldap_import] else: - row = [user.email, status, create_at, last_login, - is_admin, ldap_import] + row = [user.email, user.name, user.contact_email, status, + create_at, last_login, is_admin, ldap_import] data_list.append(row)