Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Odevzdávací Systém MO
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Martin Mareš
Odevzdávací Systém MO
Commits
88860632
Commit
88860632
authored
4 years ago
by
Jan Prachař
Browse files
Options
Downloads
Patches
Plain Diff
Oprava nekonzistence mezi seznamem účastníků kola a soutěže
parent
6058cac8
No related branches found
No related tags found
1 merge request
!44
Oprava nekonzistence mezi seznamem účastníků kola a soutěže
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
mo/web/org_round.py
+9
-6
9 additions, 6 deletions
mo/web/org_round.py
mo/web/templates/org_round_list.html
+0
-3
0 additions, 3 deletions
mo/web/templates/org_round_list.html
with
9 additions
and
9 deletions
mo/web/org_round.py
+
9
−
6
View file @
88860632
...
@@ -301,7 +301,8 @@ def org_round_task_batch_points(round_id: int, task_id: int):
...
@@ -301,7 +301,8 @@ def org_round_task_batch_points(round_id: int, task_id: int):
@app.route
(
'
/org/contest/r/<int:id>/list
'
,
methods
=
(
'
GET
'
,
'
POST
'
))
@app.route
(
'
/org/contest/r/<int:id>/list
'
,
methods
=
(
'
GET
'
,
'
POST
'
))
def
org_round_list
(
id
:
int
):
def
org_round_list
(
id
:
int
):
round
,
rr
=
get_round_rr
(
id
,
Right
.
manage_contest
,
True
)
round
,
rr
=
get_round_rr
(
id
,
None
,
True
)
can_edit
=
rr
.
have_right
(
Right
.
manage_contest
)
format
=
request
.
args
.
get
(
'
format
'
,
""
)
format
=
request
.
args
.
get
(
'
format
'
,
""
)
filter
=
ParticipantsFilterForm
(
request
.
args
)
filter
=
ParticipantsFilterForm
(
request
.
args
)
...
@@ -314,6 +315,8 @@ def org_round_list(id: int):
...
@@ -314,6 +315,8 @@ def org_round_list(id: int):
participation_state
=
filter
.
f_participation_state
,
participation_state
=
filter
.
f_participation_state
,
)
)
action_form
=
None
if
can_edit
:
action_form
=
ParticipantsActionForm
()
action_form
=
ParticipantsActionForm
()
if
action_form
.
do_action
(
round
=
round
,
query
=
query
):
if
action_form
.
do_action
(
round
=
round
,
query
=
query
):
# Action happened, redirect
# Action happened, redirect
...
@@ -323,7 +326,7 @@ def org_round_list(id: int):
...
@@ -323,7 +326,7 @@ def org_round_list(id: int):
(
count
,
query
)
=
filter
.
apply_limits
(
query
,
pagesize
=
50
)
(
count
,
query
)
=
filter
.
apply_limits
(
query
,
pagesize
=
50
)
# count = db.get_count(query)
# count = db.get_count(query)
table
=
make_contestant_table
(
query
,
add_contest_column
=
True
,
add_checkbox
=
True
)
table
=
make_contestant_table
(
query
,
add_contest_column
=
True
,
add_checkbox
=
can_edit
)
return
render_template
(
return
render_template
(
'
org_round_list.html
'
,
'
org_round_list.html
'
,
round
=
round
,
round
=
round
,
...
...
This diff is collapsed.
Click to expand it.
mo/web/templates/org_round_list.html
+
0
−
3
View file @
88860632
...
@@ -47,7 +47,4 @@
...
@@ -47,7 +47,4 @@
{% include 'parts/org_participants_table_actions.html' %}
{% include 'parts/org_participants_table_actions.html' %}
<br>
<i>
Upozornění: Můžete editovat jen účastníky soutěžící v oblastech, ke kterým máte právo.
</i>
{% endblock %}
{% endblock %}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment