From a3dbecdd1803e7e9174aeca38fe0e78e962232c4 Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@ctfd.io>
Date: Tue, 16 Mar 2021 15:32:38 -0400
Subject: [PATCH] Link directly to users from the submissions page in teams
 mode (#1823)

* Links directly to users who submitted something in the submissions page if the CTF is in teams mode.
* Closes #1813
---
 CTFd/admin/submissions.py                    | 12 +-----------
 CTFd/constants/config.py                     |  6 ++++++
 CTFd/themes/admin/templates/submissions.html | 15 +++++++++++++--
 CTFd/utils/modes/__init__.py                 |  1 +
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/CTFd/admin/submissions.py b/CTFd/admin/submissions.py
index 805dd122..273703db 100644
--- a/CTFd/admin/submissions.py
+++ b/CTFd/admin/submissions.py
@@ -33,17 +33,7 @@ def submissions_listing(submission_type):
     Model = get_model()
 
     submissions = (
-        Submissions.query.add_columns(
-            Submissions.id,
-            Submissions.type,
-            Submissions.challenge_id,
-            Submissions.provided,
-            Submissions.account_id,
-            Submissions.date,
-            Challenges.name.label("challenge_name"),
-            Model.name.label("account_name"),
-        )
-        .filter_by(**filters_by)
+        Submissions.query.filter_by(**filters_by)
         .filter(*filters)
         .join(Challenges)
         .join(Model)
diff --git a/CTFd/constants/config.py b/CTFd/constants/config.py
index 2f08bac9..6d814201 100644
--- a/CTFd/constants/config.py
+++ b/CTFd/constants/config.py
@@ -13,6 +13,12 @@ class ConfigTypes(str, RawEnum):
     REGISTRATION_VISIBILITY = "registration_visibility"
 
 
+@JinjaEnum
+class UserModeTypes(str, RawEnum):
+    USERS = "users"
+    TEAMS = "teams"
+
+
 @JinjaEnum
 class ChallengeVisibilityTypes(str, RawEnum):
     PUBLIC = "public"
diff --git a/CTFd/themes/admin/templates/submissions.html b/CTFd/themes/admin/templates/submissions.html
index 03708a66..d4f969b7 100644
--- a/CTFd/themes/admin/templates/submissions.html
+++ b/CTFd/themes/admin/templates/submissions.html
@@ -57,6 +57,7 @@
 	</div>
 	<div class="row">
 		<div class="col-md-12">
+			{% set mode = Configs.user_mode %}
 			<table id="teamsboard" class="table table-striped border">
 				<thead>
 					<tr>
@@ -66,6 +67,9 @@
 							</div>
 						</th>
 						<th class="text-center sort-col"><b>ID</b></th>
+						{% if mode == UserModeTypes.TEAMS %}
+						<th class="sort-col"><b>User</b></th>
+						{% endif %}
 						<th class="sort-col"><b>{{ get_mode_as_word(capitalize=True) }}</b></th>
 						<th class="sort-col"><b>Challenge</b></th>
 						<th class="sort-col"><b>Type</b></th>
@@ -84,14 +88,21 @@
 						<td class="text-center" id="{{ sub.id }}">
 							{{ sub.id }}
 						</td>
+						{% if mode == UserModeTypes.TEAMS %}
+						<td>
+							<a href="{{ url_for('admin.users_detail', user_id=sub.user_id) }}">
+								{{ sub.user.name }}
+							</a>
+						</td>
+						{% endif %}
 						<td class="team" id="{{ sub.account_id }}">
 							<a href="{{ generate_account_url(sub.account_id, admin=True) }}">
-								{{ sub.account_name }}
+								{{ sub.account.name }}
 							</a>
 						</td>
 						<td class="chal" id="{{ sub.challenge_id }}">
 							<a href="{{ url_for('admin.challenges_detail', challenge_id=sub.challenge_id) }}">
-								{{ sub.challenge_name }}
+								{{ sub.challenge.name }}
 							</a>
 						</td>
 						<td>
diff --git a/CTFd/utils/modes/__init__.py b/CTFd/utils/modes/__init__.py
index eace168b..4e0d3f29 100644
--- a/CTFd/utils/modes/__init__.py
+++ b/CTFd/utils/modes/__init__.py
@@ -3,6 +3,7 @@ from flask import url_for
 from CTFd.models import Teams, Users
 from CTFd.utils import get_config
 
+# TODO: Replace these constants with the UserModeTypes enum
 USERS_MODE = "users"
 TEAMS_MODE = "teams"