From d008b7eb6dabab0feaf71e211e986f0bf4299fb6 Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Mon, 17 Jan 2022 21:10:53 +0100
Subject: [PATCH] =?UTF-8?q?P=C5=99ep=C3=ADna=C4=8De=20stav=C5=AF=20odkazuj?=
=?UTF-8?q?=C3=AD=20na=20n=C3=A1vod?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
mo/web/org_contest.py | 1 +
mo/web/org_round.py | 8 ++++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/mo/web/org_contest.py b/mo/web/org_contest.py
index 13fc7e19..640a3670 100644
--- a/mo/web/org_contest.py
+++ b/mo/web/org_contest.py
@@ -1570,6 +1570,7 @@ def org_contest_edit(ct_id: int):
assert contest and round
form = ContestEditForm(obj=contest)
+ form.state.description = Markup("Popis stavů najdete v <a href='" + url_for('doc_org') + "#kola'>návodu</a>.")
if round.state != db.RoundState.delegate:
form.state.render_kw = {'disabled': ""}
form.state.description = 'Nastavení kola neumožňuje měnit stav soutěže.'
diff --git a/mo/web/org_round.py b/mo/web/org_round.py
index 55d43024..578b9b11 100644
--- a/mo/web/org_round.py
+++ b/mo/web/org_round.py
@@ -1,12 +1,13 @@
from dataclasses import dataclass, field
import decimal
-from flask import render_template, g, redirect, flash, request
+from flask import render_template, g, redirect, flash, request, url_for
import locale
import flask_wtf.file
from flask_wtf.form import FlaskForm
import bleach
from bleach.sanitizer import ALLOWED_TAGS
import markdown
+from markupsafe import Markup
import os
from sqlalchemy.orm import joinedload
from typing import Optional, List, Dict, Tuple, Set
@@ -381,7 +382,7 @@ class RoundEditForm(FlaskForm):
)
state = wtforms.SelectField(
"Stav kola", choices=db.RoundState.choices(), coerce=db.RoundState.coerce,
- description="Stav soutěží ve všech oblastech kola. Pokud zvolíme 'po oblastech', každá soutěž si svůj stav určuje sama.",
+ # description nastaveno za běhu, protože obsahuje generované odkazy
)
# Only the desktop Firefox does not support datetime-local field nowadays,
# other browsers does provide date and time picker UI :(
@@ -416,6 +417,9 @@ def org_round_edit(round_id: int):
round = ctx.round
form = RoundEditForm(obj=round)
+ form.state.description = ("Stav soutěží ve všech oblastech kola (viz "
+ + Markup("<a href='" + url_for('doc_org') + "#kola'>návod</a>).")
+ + " Pokud zvolíme „po oblastech“, každá soutěž si svůj stav určuje sama.")
if round.is_subround():
# podkolo nemá nastavení výsledkové listiny
del form.score_mode
--
GitLab