From 537e7b39f18fd36531dd0bbe30301d18b0e5a462 Mon Sep 17 00:00:00 2001 From: Jonas Havelka Date: Sun, 19 Sep 2021 19:16:37 +0200 Subject: [PATCH] =?UTF-8?q?Fix=20V=20do=C5=A1l=C3=BDch=20=C5=99e=C5=A1en?= =?UTF-8?q?=C3=ADch=20=E2=80=93=20p=C5=99edp=C5=99ipraven=C3=BD=20p=C5=99e?= =?UTF-8?q?dm=C4=9Bt=20(sp=C3=AD=C5=A1,=20co=20m=C4=9B=20jen=20tak=20napad?= =?UTF-8?q?lo)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/models.py | 5 +++++ seminar/templates/seminar/odevzdavatko/detail.html | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/seminar/models.py b/seminar/models.py index e6e47a03..c9e44885 100644 --- a/seminar/models.py +++ b/seminar/models.py @@ -30,6 +30,7 @@ from taggit.managers import TaggableManager from reversion import revisions as reversion from seminar.utils import roman, FirstTagParser # Pro získání úryvku z TextNode +from seminar.utils import hlavni_problem from seminar import treelib from unidecode import unidecode # Používám pro získání ID odkazu (ještě je to někde po někom zakomentované) @@ -924,6 +925,10 @@ class Problem(SeminarModelBase,PolymorphicModel): def admin_url(self): return reverse('admin:seminar_problem_change', args=(self.id, )) + def hlavni_problem(self): + """ Pro daný problém vrátí jeho nejvyšší nadproblém.""" + return hlavni_problem(self) + # FIXME - k úloze def body_v_zavorce(self): """Vrať string s body v závorce jsou-li u problému vyplněné, jinak '' diff --git a/seminar/templates/seminar/odevzdavatko/detail.html b/seminar/templates/seminar/odevzdavatko/detail.html index 0fcb56f9..9566441f 100644 --- a/seminar/templates/seminar/odevzdavatko/detail.html +++ b/seminar/templates/seminar/odevzdavatko/detail.html @@ -60,7 +60,7 @@ $(document).ready(function(){

Řešené problémy: {{ object.problem.all | join:", " }}

-

Řešitelé: {% for r in object.resitele.all %} {{ r }} ({{ r.osoba.email }}) +

Řešitelé: {% for r in object.resitele.all %} {{ r }} ({{ r.osoba.email }}) {% if forloop.revcounter0 != 0 %}, {% endif %} {% endfor %}

{# https://docs.djangoproject.com/en/3.1/ref/models/instances/#django.db.models.Model.get_FOO_display #}