From 4b61ba9894fa7e7f039fac6252b98d2957c31d46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Koci=C3=A1n?= Date: Sun, 6 Sep 2015 23:39:13 +0200 Subject: [PATCH] =?UTF-8?q?Z=20aktu=C3=A1ln=C3=ADch=20zad=C3=A1n=C3=AD=20v?= =?UTF-8?q?y=C5=99azena=20t=C3=A9mata?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/templates/seminar/zadani/AktualniZadani.html | 3 +-- seminar/views.py | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/seminar/templates/seminar/zadani/AktualniZadani.html b/seminar/templates/seminar/zadani/AktualniZadani.html index 3b5c09ea..47bee216 100644 --- a/seminar/templates/seminar/zadani/AktualniZadani.html +++ b/seminar/templates/seminar/zadani/AktualniZadani.html @@ -8,7 +8,7 @@ Termín odeslání {{ac.cislo}}. série: {{ac.datum_deadline}} {#TODO a co speciální deadline pro účast na soustředění? #} - {% for problem in ac.zadane_problemy.all %} + {% for problem in zadani %} {# TODO použít {{problem.kod_v_rocniku}} ? vrací 4.u1 místo 4.1 #}

{{problem.cislo_zadani.cislo}}.{{problem.kod}} {{problem.nazev}} ({{problem.body}}b)

{% autoescape off %}{{problem.text_zadani}}{% endautoescape %} @@ -21,4 +21,3 @@ {% endblock content %} - diff --git a/seminar/views.py b/seminar/views.py index c654f60f..ce202123 100644 --- a/seminar/views.py +++ b/seminar/views.py @@ -13,7 +13,8 @@ from . import utils def AktualniZadaniView(request): nastaveni = get_object_or_404(Nastaveni) return render(request, 'seminar/zadani/AktualniZadani.html', - {'nastaveni' : nastaveni, + {'nastaveni': nastaveni, + 'zadani': nastaveni.aktualni_cislo.zadane_problemy.exclude(typ=Problem.TYP_TEMA), }, ) ### Titulni strana