mam/mamweb
13
1
Fork 0
Code Issues Pull requests 12 Projects Wiki Activity Actions

Merge branch 'data_migrations' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into data_migrations

Browse source
This commit is contained in:
Tomas 'Jethro' Pokorny 2021-02-16 20:23:23 +01:00
commit 3793efdab7
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
seminar/templates/seminar/zadani/AktualniZadani.html
View file

@ -21,7 +21,7 @@
{% endif %}
{% if ac.datum_preddeadline %}
<div class="zadani_azad_termin">
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}}
</div>
{% endif %}

2
seminar/views/views_all.py
View file

@ -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: