From c60ca2419197bea72217fb002c980b253319b613 Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Mon, 30 Aug 2021 23:24:08 +0200
Subject: [PATCH] =?UTF-8?q?P=C5=99ejmenov=C3=A1n=C3=AD=20=C4=8Desk=C3=BDch?=
 =?UTF-8?q?=20fragment=C5=AF=20URL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #65.
---
 mo/web/org.py                   |  4 ++--
 mo/web/org_contest.py           | 12 ++++++------
 mo/web/templates/org_index.html |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/mo/web/org.py b/mo/web/org.py
index 72c67429..78d5c77c 100644
--- a/mo/web/org.py
+++ b/mo/web/org.py
@@ -78,8 +78,8 @@ school_export_columns = (
 )
 
 
-@app.route('/org/export/skoly')
-def org_export_skoly():
+@app.route('/org/export/schools')
+def org_export_shools():
     sess = db.get_session()
     format = request.args.get('format', 'en_csv')
 
diff --git a/mo/web/org_contest.py b/mo/web/org_contest.py
index 9b99ac9a..3eb31e2e 100644
--- a/mo/web/org_contest.py
+++ b/mo/web/org_contest.py
@@ -443,10 +443,10 @@ def org_contest_import(id: int):
 
 
 # URL je explicitně uvedeno v mo.email.contestant_list_url
-@app.route('/org/contest/c/<int:id>/ucastnici', methods=('GET', 'POST'))
-@app.route('/org/contest/c/<int:id>/site/<int:site_id>/ucastnici', methods=('GET', 'POST'))
-@app.route('/org/contest/c/<int:id>/ucastnici/emails', endpoint="org_contest_list_emails")
-@app.route('/org/contest/c/<int:id>/site/<int:site_id>/ucastnici/emails', endpoint="org_contest_list_emails")
+@app.route('/org/contest/c/<int:id>/participants', methods=('GET', 'POST'))
+@app.route('/org/contest/c/<int:id>/site/<int:site_id>/participants', methods=('GET', 'POST'))
+@app.route('/org/contest/c/<int:id>/participants/emails', endpoint="org_contest_list_emails")
+@app.route('/org/contest/c/<int:id>/site/<int:site_id>/participants/emails', endpoint="org_contest_list_emails")
 def org_contest_list(id: int, site_id: Optional[int] = None):
     contest, master_contest, site, rr = get_contest_site_rr(id, site_id, Right.view_contestants)
     can_edit = rr.have_right(Right.manage_contest) and request.endpoint != 'org_contest_list_emails'
@@ -1651,8 +1651,8 @@ class ParticipantAddForm(FlaskForm):
         self.participation_place.description = f'Pokud účastník soutěží někde jinde než {contest.place.name_locative()}, vyplňte <a href="{url_for("org_place", id=contest.place.place_id)}">kód místa</a>. Dozor na tomto místě pak může za účastníka odevzdávat řešení.'
 
 
-@app.route('/org/contest/c/<int:id>/ucastnici/pridat', methods=('GET', 'POST'))
-@app.route('/org/contest/c/<int:id>/site/<int:site_id>/ucastnici/pridat', methods=('GET', 'POST'))
+@app.route('/org/contest/c/<int:id>/participants/new', methods=('GET', 'POST'))
+@app.route('/org/contest/c/<int:id>/site/<int:site_id>/participants/new', methods=('GET', 'POST'))
 def org_contest_add_user(id: int, site_id: Optional[int] = None):
     contest, master_contest, site, rr = get_contest_site_rr(id, site_id, right_needed=Right.manage_contest)
 
diff --git a/mo/web/templates/org_index.html b/mo/web/templates/org_index.html
index 73a21f88..e4a5b0f5 100644
--- a/mo/web/templates/org_index.html
+++ b/mo/web/templates/org_index.html
@@ -41,9 +41,9 @@
 <li><a href='{{ url_for('doc_garant') }}'>Návod pro garanty</a> (může se hodit i ostatním organizátorům)
 <li><a href='{{ url_for('static', filename='doc/import-navod.pdf') }}'>Podrobnější návod k importům</a> (PDF)
 <li>Export všech škol:
-	<a href='{{ url_for('org_export_skoly', format='en_csv') }}'>CSV s čárkami</a>,
-	<a href='{{ url_for('org_export_skoly', format='cs_csv') }}'>CSV se středníky</a>,
-	<a href='{{ url_for('org_export_skoly', format='tsv') }}'>TSV</a>
+	<a href='{{ url_for('org_export_schools', format='en_csv') }}'>CSV s čárkami</a>,
+	<a href='{{ url_for('org_export_schools', format='cs_csv') }}'>CSV se středníky</a>,
+	<a href='{{ url_for('org_export_schools', format='tsv') }}'>TSV</a>
 <li><a href='https://docs.google.com/document/d/1XXk7Od-ZKtfmfNa-9FpFjUqmy0Ekzf2-2q3EpSWyn1w/edit?usp=sharing'>Návod na tvorbu PDF</a>
 </ul>
 
-- 
GitLab