From 3e71a2daa533ed69826c46ae33963631322caab1 Mon Sep 17 00:00:00 2001 From: Joel Butler <90467562+joelebutler@users.noreply.github.com> Date: Sun, 5 Jun 2022 03:46:18 -0400 Subject: [PATCH] Add info to user scoreboard csv (#2136) * Add info to user scoreboard csv Added user id and user email fields to the user mode scoreboard csv export as per issue #2133. * Run formatter Co-authored-by: Kevin Chung --- CTFd/utils/csv/__init__.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/CTFd/utils/csv/__init__.py b/CTFd/utils/csv/__init__.py index 6156e389..3f1ef924 100644 --- a/CTFd/utils/csv/__init__.py +++ b/CTFd/utils/csv/__init__.py @@ -111,7 +111,13 @@ def dump_scoreboard_csv(): ) writer.writerow(user_row) elif is_users_mode(): - header = ["place", "user", "score"] + user_field_names + header = [ + "place", + "user name", + "user id", + "user email", + "score", + ] + user_field_names writer.writerow(header) for i, standing in enumerate(standings): @@ -122,7 +128,13 @@ def dump_scoreboard_csv(): user_field_values = [ user_field_entries.get(f_id, "") for f_id in user_field_ids ] - user_row = [i + 1, user.name, standing.score] + user_field_values + user_row = [ + i + 1, + user.name, + user.id, + user.email, + standing.score, + ] + user_field_values writer.writerow(user_row) # In Python 3 send_file requires bytes