From f063f26d473152b92d33b737ba37796cdc99d9f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Pracha=C5=99?= <jan.prachar@gmail.com>
Date: Mon, 1 Mar 2021 05:31:10 +0100
Subject: [PATCH] =?UTF-8?q?Oprava=20seznamu=20=C3=BA=C4=8Dastn=C3=ADk?=
=?UTF-8?q?=C5=AF=20sout=C4=9B=C5=BEn=C3=ADho=20m=C3=ADsta?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
mo/web/org_contest.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/mo/web/org_contest.py b/mo/web/org_contest.py
index 9bc9872a..71fce797 100644
--- a/mo/web/org_contest.py
+++ b/mo/web/org_contest.py
@@ -422,7 +422,7 @@ def org_contest_list(id: int, site_id: Optional[int] = None):
filter = ParticipantsFilterForm(request.args)
filter.validate()
query = get_contestants_query(
- round=contest.round, contest=contest,
+ round=contest.round, contest=contest, site=site,
school=filter.f_school,
# contest_place=filter.f_contest_place,
participation_place=filter.f_participation_place,
@@ -467,6 +467,7 @@ contest_list_columns = (
def get_contestants_query(
round: db.Round, contest: Optional[db.Contest] = None,
+ site: Optional[db.Place] = None,
contest_place: Optional[db.Place] = None,
participation_place: Optional[db.Place] = None,
participation_state: Optional[db.PartState] = None,
@@ -483,6 +484,8 @@ def get_contestants_query(
query = query.filter(db.Contest.round == round)
query = query.options(joinedload(db.Contest.place))
query = query.filter(db.Participation.contest_id == db.Contest.contest_id)
+ if site:
+ query = query.filter(db.Participation.place_id == site.place_id)
if contest_place:
query = query.filter(db.Contest.place_id == contest_place.place_id)
if participation_place:
--
GitLab