diff --git a/src/apps/pages/views.py b/src/apps/pages/views.py index cd8a9d946..bf32519b7 100644 --- a/src/apps/pages/views.py +++ b/src/apps/pages/views.py @@ -62,13 +62,18 @@ def get_context_data(self, *args, **kwargs): if not self.request.user.is_staff: raise HttpResponse(status=404) + show_child_submissions = self.request.GET.get('show_child_submissions', False) + qs = Submission.objects.all() qs = qs.filter(created_when__gte=now() - timedelta(days=2)) + if not show_child_submissions: + qs = qs.filter(parent__isnull=True) qs = qs.order_by('-created_when') qs = qs.select_related('phase__competition', 'owner') context = super().get_context_data(*args, **kwargs) context['submissions'] = qs[:250] + context['show_child_submissions'] = show_child_submissions for submission in context['submissions']: # Get filesize from each submissions's data diff --git a/src/templates/pages/server_status.html b/src/templates/pages/server_status.html index cecb57e91..a6dbc741f 100644 --- a/src/templates/pages/server_status.html +++ b/src/templates/pages/server_status.html @@ -7,10 +7,21 @@ {% block content %}

Recent submissions (up to 250 or 2 days old)

+ + + + + {% if show_child_submissions %} + + {% endif %} @@ -28,6 +39,9 @@

Recent submissions (up to 250 or 2 days old)

+ {% if show_child_submissions %} + + {% endif %} @@ -77,4 +91,22 @@

Monitor queues

+ + {% endblock %}
Competition Submission PKParent PKSize Submitter Queue
{{ submission.phase.competition.title }} {{ submission.pk }}{{ submission.parent.pk }}{{ submission.file_size }} {{ submission.owner.username }} {{ submission.competition_queue }}