From b1c87606aa27024bb505479c6ab90d4d8876c494 Mon Sep 17 00:00:00 2001
From: Jiri Kalvoda <jirikalvoda@kam.mff.cuni.cz>
Date: Fri, 24 Sep 2021 15:52:31 +0200
Subject: [PATCH] =?UTF-8?q?ParticipantsFilterForm=20nepou=C5=BEivat=20f=5F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
mo/web/org_contest.py | 10 ++++------
mo/web/org_round.py | 8 ++++----
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/mo/web/org_contest.py b/mo/web/org_contest.py
index 34d55e0e..755f7b4d 100644
--- a/mo/web/org_contest.py
+++ b/mo/web/org_contest.py
@@ -421,15 +421,13 @@ def org_contest_list(id: int, site_id: Optional[int] = None):
filter = ParticipantsFilterForm(formdata=request.args)
if request.args:
filter.validate()
- f_participation_state = filter.participation_place.data
- if not f_participation_place:
- f_participation_place = "*"
+
query = get_contestants_query(
round=master_contest.round, contest=master_contest, site=site,
school=filter.school.place,
- # contest_place=filter.f_contest_place,
- participation_place=filter.participation_place.data,
- participation_state=f_participation_state
+ contest_place=filter.contest_place.place,
+ participation_place=filter.participation_place.place,
+ participation_state=mo.util.star_is_none(filter.participation_state.data),
)
action_form = None
diff --git a/mo/web/org_round.py b/mo/web/org_round.py
index 0a9dd798..ad64f29e 100644
--- a/mo/web/org_round.py
+++ b/mo/web/org_round.py
@@ -357,10 +357,10 @@ def org_round_list(id: int):
filter.validate()
query = get_contestants_query(
round=master_round,
- school=filter.f_school,
- contest_place=filter.f_contest_place,
- participation_place=filter.f_participation_place,
- participation_state=filter.f_participation_state,
+ school=filter.school.place,
+ contest_place=filter.contest_place.place,
+ participation_place=filter.participation_place.place,
+ participation_state=mo.util.star_is_none(filter.participation_state.data),
)
action_form = None
--
GitLab