|
|
@ -386,7 +386,15 @@ class NahrajReseniNadproblemView(LoginRequiredMixin, ListView): |
|
|
template_name = 'odevzdavatko/nahraj_reseni_nadproblem.html' |
|
|
template_name = 'odevzdavatko/nahraj_reseni_nadproblem.html' |
|
|
|
|
|
|
|
|
def get_queryset(self): |
|
|
def get_queryset(self): |
|
|
return super().get_queryset().filter(nadproblem__isnull=True) |
|
|
# COPY PASTE z api/views/autocomplete.py TODO hodit někam do utils? |
|
|
|
|
|
nastaveni = get_object_or_404(m.Nastaveni) |
|
|
|
|
|
rocnik = nastaveni.aktualni_rocnik |
|
|
|
|
|
# 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_zadani__rocnik=rocnik, stav=m.Problem.STAV_ZADANY) |
|
|
|
|
|
clanekQ = Q(Clanek___cislo__rocnik=rocnik, stav=m.Problem.STAV_ZADANY) |
|
|
|
|
|
qs = super().get_queryset().filter(temaQ | ulohaQ | clanekQ) |
|
|
|
|
|
return qs.filter(nadproblem__isnull=True) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class NahrajReseniView(LoginRequiredMixin, CreateView): |
|
|
class NahrajReseniView(LoginRequiredMixin, CreateView): |
|
|
|
