diff --git a/mo/web/org.py b/mo/web/org.py index 72c67429e74bc812683b708653fb918e54036d56..78d5c77c8a22783b8dbadbc8186ee52a8e4bea11 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 9b99ac9a3e14e8826e6997ab8f12472c8cdffaf2..3eb31e2eecdf393c9657e25483005fb6022f7fe7 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 73a21f886d3be32aea08d14005d44e0d0e0e022d..e4a5b0f5011b8458a24583502c2dadb683287f0e 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>