lkva/NDOJ
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor submission views

Browse source
This commit is contained in:
cuom1999 2023-01-04 15:11:00 -06:00
parent 69692504aa
commit a512694976
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
judge/views/submission.py
View file

@ -159,9 +159,9 @@ class SubmissionSource(SubmissionDetailBase):
def get_hidden_subtasks(request, submission): def get_hidden_subtasks(request, submission):
if request.user.is_superuser:
return set()
contest = submission.contest_object contest = submission.contest_object
if contest.is_editable_by(request.user):
return set()
if contest and contest.format.has_hidden_subtasks: if contest and contest.format.has_hidden_subtasks:
try: try:
return contest.format.get_hidden_subtasks().get( return contest.format.get_hidden_subtasks().get(
@ -369,8 +369,8 @@ class SubmissionsListBase(DiggPaginatorMixin, TitleMixin, ListView):
if not self.contest.can_see_full_scoreboard(self.request.user): if not self.contest.can_see_full_scoreboard(self.request.user):
queryset = queryset.filter(user=self.request.profile) queryset = queryset.filter(user=self.request.profile)
if ( if (
self.contest.format_name == "ioi16" self.contest.format.has_hidden_subtasks
and not self.request.user.is_superuser and not self.contest.is_editable_by(self.request.user)
): ):
queryset = queryset.filter(user=self.request.profile) queryset = queryset.filter(user=self.request.profile)
if self.contest.freeze_after and not self.include_frozen: if self.contest.freeze_after and not self.include_frozen:
@ -450,7 +450,7 @@ class SubmissionsListBase(DiggPaginatorMixin, TitleMixin, ListView):
return ( return (
self.in_contest self.in_contest
and self.contest.format.has_hidden_subtasks and self.contest.format.has_hidden_subtasks
and not self.request.user.is_superuser and not self.contest.is_editable_by(self.request.user)
) )
def modify_attrs(self, submission): def modify_attrs(self, submission):
@ -516,7 +516,7 @@ class SubmissionsListBase(DiggPaginatorMixin, TitleMixin, ListView):
self.selected_languages = set(request.GET.getlist("language")) self.selected_languages = set(request.GET.getlist("language"))
self.selected_statuses = set(request.GET.getlist("status")) self.selected_statuses = set(request.GET.getlist("status"))
if request.user.is_superuser: if self.contest and self.contest.is_editable_by(self.request.user):
self.include_frozen = True self.include_frozen = True
if "results" in request.GET: if "results" in request.GET:
@ -916,10 +916,9 @@ class UserContestSubmissionsAjax(UserContestSubmissions):
subtask = 0 subtask = 0
problem_points = pp problem_points = pp
submission = Submission.objects.get(id=sub_id) submission = Submission.objects.get(id=sub_id)
if ( if subtask in hidden_subtasks.get(
subtask in hidden_subtasks.get(str(problem_id), set()) str(problem_id), set()
and not self.request.user.is_superuser ) and not self.contest.is_editable_by(self.request.user):
):
best_subtasks[subtask] = { best_subtasks[subtask] = {
"submission": None, "submission": None,
"contest_time": None, "contest_time": None,
@ -965,7 +964,9 @@ class UserContestSubmissionsAjax(UserContestSubmissions):
filtered_submissions = [] filtered_submissions = []
# Only show this for some users when using ioi16 # Only show this for some users when using ioi16
if self.contest.format.has_hidden_subtasks or self.request.user.is_superuser: if not self.contest.format.has_hidden_subtasks or self.contest.is_editable_by(
self.request.user
):
for s in context["submissions"]: for s in context["submissions"]:
if not hasattr(s, "contest"): if not hasattr(s, "contest"):
continue continue