From edf29bfb66ef01029d39dcd6c6fd0465401d98f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kate=C5=99ina=20=C4=8C?= Date: Tue, 16 Feb 2021 20:09:33 +0100 Subject: [PATCH 1/2] =?UTF-8?q?p=C5=99eklep?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/templates/seminar/zadani/AktualniZadani.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seminar/templates/seminar/zadani/AktualniZadani.html b/seminar/templates/seminar/zadani/AktualniZadani.html index e87821ae..e6fc298f 100644 --- a/seminar/templates/seminar/zadani/AktualniZadani.html +++ b/seminar/templates/seminar/zadani/AktualniZadani.html @@ -21,7 +21,7 @@ {% endif %} {% if ac.datum_preddeadline %}
- Termín odeslání {{ac.poradi}}. série pro otištění v dlaším čísle: + Termín odeslání {{ac.poradi}}. série pro otištění v dalším čísle: {{ac.datum_preddeadline}}
{% endif %} From b1539258d95cbdc0221518b526235fff8e8c6345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kate=C5=99ina=20=C4=8C?= Date: Tue, 16 Feb 2021 20:10:34 +0100 Subject: [PATCH 2/2] =?UTF-8?q?vydan=C3=BD=20=C4=8Dl=C3=A1nek=20je=20vy?= =?UTF-8?q?=C5=99e=C5=A1en=C3=BD,=20ne=20zadan=C3=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/views/views_all.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seminar/views/views_all.py b/seminar/views/views_all.py index 42e982f5..24d31ecc 100644 --- a/seminar/views/views_all.py +++ b/seminar/views/views_all.py @@ -1382,7 +1382,7 @@ class ClankyResitelView(generic.ListView): # FIXME: QuerySet není pole! def get_queryset(self): - clanky = Clanek.objects.filter(stav=Problem.STAV_ZADANY).select_related('cislo__rocnik').order_by('-cislo__rocnik__rocnik') + clanky = Clanek.objects.filter(stav=Problem.STAV_VYRESENY).select_related('cislo__rocnik').order_by('-cislo__rocnik__rocnik') queryset = [] skupiny_clanku = group_by_rocnik(clanky) for skupina in skupiny_clanku: