From 288c8ad4599c4a2996b81fa7a98a931b97cbdd51 Mon Sep 17 00:00:00 2001 From: Karel Balej Date: Mon, 19 Dec 2022 21:59:32 +0100 Subject: [PATCH] =?UTF-8?q?odevzdavatko:=20zjednodu=C5=A1en=C3=AD=20Detail?= =?UTF-8?q?ReseniView?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- odevzdavatko/views.py | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/odevzdavatko/views.py b/odevzdavatko/views.py index 1e27d4f1..3428edaa 100644 --- a/odevzdavatko/views.py +++ b/odevzdavatko/views.py @@ -219,24 +219,12 @@ class DetailReseniView(DetailView): model = m.Reseni template_name = 'odevzdavatko/detail.html' - def aktualni_hodnoceni(self): - self.reseni = get_object_or_404(m.Reseni, id=self.kwargs['pk']) - result = [] # Slovníky s klíči problem, body, deadline_body -- initial data pro f.OhodnoceniReseniFormSet - for hodn in m.Hodnoceni.objects.filter(reseni=self.reseni): - result.append({ - "problem": hodn.problem, - "body": hodn.body, - "deadline_body": hodn.deadline_body, - "feedback": hodn.feedback, - }) - return result - def get_context_data(self, **kw): + reseni = get_object_or_404(m.Reseni, id=self.kwargs['pk']) + initial = m.Hodnoceni.objects.filter(reseni=reseni).values('problem', 'body', 'deadline_body', 'feedback',) ctx = super().get_context_data(**kw) - ctx['form'] = f.OhodnoceniReseniFormSet( - initial = self.aktualni_hodnoceni() - ) - ctx['poznamka_form'] = f.PoznamkaReseniForm(instance=self.reseni) + ctx['form'] = f.OhodnoceniReseniFormSet(initial=initial) + ctx['poznamka_form'] = f.PoznamkaReseniForm(instance=reseni) return ctx