From 154d629ef88d2353674d14aac8fd689fe5a81898 Mon Sep 17 00:00:00 2001 From: MaM Web user Date: Wed, 10 Oct 2018 00:37:17 +0200 Subject: [PATCH 1/2] =?UTF-8?q?Opraven=C3=AD=20ob=C3=A1lek?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seminar/views.py b/seminar/views.py index 0f7ebc1c..25d72f7f 100644 --- a/seminar/views.py +++ b/seminar/views.py @@ -550,7 +550,7 @@ def aktivniResitele(rocnik,cislo): letos.cisla = Cislo.objects.filter(rocnik=letos.rocnik,cislo__lte = cislo) loni.cisla = Cislo.objects.filter(rocnik=loni.rocnik) if int(cislo) > 3: - problemy = Problem.objects.filter(cislo_zadani = letos.cisla) + problemy = Problem.objects.filter(cislo_zadani__in = letos.cisla) else: problemy = Problem.objects.filter(Q(cislo_zadani__in = letos.cisla)|Q(cislo_zadani__in = loni.cisla)) resitele = aktualni_resitele.filter(reseni__in = Reseni.objects.filter(problem__in=problemy)).distinct() From 9e914bbed35e5771e59d6202c91425cbb117d7b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Koci=C3=A1n?= Date: Sun, 18 Nov 2018 22:06:20 +0100 Subject: [PATCH 2/2] =?UTF-8?q?Nepos=C3=ADlej=20Gaventovi=20maily=20o=20ch?= =?UTF-8?q?yb=C3=A1ch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mamweb/settings_prod.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/mamweb/settings_prod.py b/mamweb/settings_prod.py index bd51d5e7..918fd4b2 100644 --- a/mamweb/settings_prod.py +++ b/mamweb/settings_prod.py @@ -47,11 +47,7 @@ DATABASES = { import os SERVER_EMAIL = 'mamweb-prod-errors@mam.mff.cuni.cz' -ADMINS = [ - ('Tomas Gavenciak', 'gavento@gmail.com'), - ('Matěj Kocián', 'matej.kocian@gmail.com'), - ('M&M ERRORs', 'mam-errors@mam.mff.cuni.cz'), - ] +ADMINS = [('M&M ERRORs', 'mam-errors@mam.mff.cuni.cz')] # SECURITY: only send sensitive cookies via HTTPS