From 5c9632d8fe7f5488af6c654dfec36b6c1fa44e4b Mon Sep 17 00:00:00 2001 From: MaM Web user Date: Sat, 4 Sep 2021 17:43:32 +0200 Subject: [PATCH] =?UTF-8?q?=C4=8C=C3=A1ste=C4=8Dn=C3=A1=20oprava=20autocom?= =?UTF-8?q?plete?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Už to má v seznamu správné problémy, ale neumí to hledat. --- seminar/views/autocomplete.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/seminar/views/autocomplete.py b/seminar/views/autocomplete.py index f63ab5ac..13905fd6 100644 --- a/seminar/views/autocomplete.py +++ b/seminar/views/autocomplete.py @@ -33,15 +33,17 @@ class OdevzdatelnyProblemAutocomplete(autocomplete.Select2QuerySetView): def get_queryset(self): nastaveni = get_object_or_404(m.Nastaveni) rocnik = nastaveni.aktualni_rocnik - temata = m.Tema.objects.filter(rocnik=rocnik, stav=m.Problem.STAV_ZADANY) - ulohy = m.Uloha.objects.filter(cislo_deadline__rocnik = rocnik) - clanky = m.Clanek.objects.filter(cislo__rocnik = rocnik, stav=m.Problem.STAV_ZADANY) # FIXME: Je tohle to, co chceme? - print(temata, ulohy, clanky) - ulohy.union(temata, all=True) - print(ulohy) - ulohy.union(clanky, all=True) - print(ulohy) - qs = ulohy + # Od tohoto místa dál jsem zkoušel spoustu variací podle https://django-polymorphic.readthedocs.io/en/stable/advanced.html + temaQ = Q(Tema___rocnik = rocnik, stav=m.Problem.STAV_ZADANY) + ulohaQ = Q(Uloha___cislo_deadline__rocnik = rocnik, stav=m.Problem.STAV_ZADANY) + clanekQ = Q(Clanek___cislo__rocnik = rocnik, stav=m.Problem.STAV_ZADANY) + qs = m.Problem.objects.filter(temaQ | ulohaQ | clanekQ) + #print(temata, ulohy, clanky) + #ulohy.union(temata, all=True) + #print(ulohy) + #ulohy.union(clanky, all=True) + #print(ulohy) + #qs = ulohy print(qs) if self.q: qs = qs.filter(