From 9f43e712d0234f2e534c969da820a7e88abf4133 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Mon, 30 May 2022 18:23:31 -0500 Subject: [PATCH] Add more statuses to submission --- judge/views/submission.py | 10 +++++++--- templates/submission/list.html | 1 - 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/judge/views/submission.py b/judge/views/submission.py index 42d941c..d8e1473 100644 --- a/judge/views/submission.py +++ b/judge/views/submission.py @@ -357,7 +357,9 @@ class SubmissionsListBase(DiggPaginatorMixin, TitleMixin, ListView): language__in=Language.objects.filter(key__in=self.selected_languages) ) if self.selected_statuses: - queryset = queryset.filter(result__in=self.selected_statuses) + queryset = queryset.filter( + Q(result__in=self.selected_statuses) | Q(status__in=self.selected_statuses) + ) return queryset @@ -385,11 +387,13 @@ class SubmissionsListBase(DiggPaginatorMixin, TitleMixin, ListView): return reverse("all_submissions") def get_searchable_status_codes(self): - hidden_codes = ["SC"] + all_statuses = list(Submission.RESULT) + all_statuses.extend([i for i in Submission.STATUS if i not in all_statuses]) + hidden_codes = ["SC", "D", "G"] if not self.request.user.is_superuser and not self.request.user.is_staff: hidden_codes += ["IE"] return [ - (key, value) for key, value in Submission.RESULT if key not in hidden_codes + (key, value) for key, value in all_statuses if key not in hidden_codes ] def get_context_data(self, **kwargs): diff --git a/templates/submission/list.html b/templates/submission/list.html index 48f0aac..07cb775 100644 --- a/templates/submission/list.html +++ b/templates/submission/list.html @@ -148,7 +148,6 @@ if (status_filter.length && 'status' in message && status_filter.indexOf(message.status) == -1) return; - var id = message.id; var row = table.find('div#' + id); if (row.length < 1) {