aljaz/CTFd
1
0
Fork 0
mirror of https://github.com/aljazceru/CTFd.git synced 2026-02-07 07:14:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix CSV export columns for team & user fields on scoreboard CSV (#2069)

Browse Source 
* Fix issue where custom field entries for Users and Teams would be misaligned in the scoreboard CSV export
This commit is contained in:
Kevin Chung
2022-03-19 14:34:31 -04:00
committed by GitHub
parent c0f171f6bc
commit f39043427b
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
CTFd/utils/csv/__init__.py
View File

@@ -80,14 +80,12 @@ def dump_scoreboard_csv():
team_field_values = [
team_field_entries.get(f_id, "") for f_id in team_field_ids
]
team_row = [
i + 1,
team.name,
team.id,
standing.score,
"",
"",
] + team_field_values
user_field_values = len(user_field_names) * [""]
team_row = (
[i + 1, team.name, team.id, standing.score, "", "", "", ""]
+ user_field_values
+ team_field_values
)
writer.writerow(team_row)
@@ -96,16 +94,21 @@ def dump_scoreboard_csv():
user_field_values = [
user_field_entries.get(f_id, "") for f_id in user_field_ids
]
user_row = [
"",
"",
"",
"",
member.name,
member.id,
member.email,
member.score,
] + user_field_values
team_field_values = len(team_field_names) * [""]
user_row = (
[
"",
"",
"",
"",
member.name,
member.id,
member.email,
member.score,
]
+ user_field_values
+ team_field_values
)
writer.writerow(user_row)
elif is_users_mode():
header = ["place", "user", "score"] + user_field_names