From d35aeaa3960da6af9f670b5b9bc5835d3ac30015 Mon Sep 17 00:00:00 2001
From: "Pavel \"LEdoian\" Turinsky" <ledoian@matfyz.cz>
Date: Tue, 26 Jan 2021 21:01:19 +0100
Subject: [PATCH 1/3] =?UTF-8?q?Chyb=C4=9Bl=20import=20Q?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seminar/views/autocomplete.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/seminar/views/autocomplete.py b/seminar/views/autocomplete.py
index 32c634bc..699a260e 100644
--- a/seminar/views/autocomplete.py
+++ b/seminar/views/autocomplete.py
@@ -1,5 +1,6 @@
 from dal import autocomplete
 from django.shortcuts import get_object_or_404
+from django.db.models import Q
 
 import seminar.models as m
 from .helpers import LoginRequiredAjaxMixin

From ba8cd2e2974b3eb618fdee0a00550e06993c51f4 Mon Sep 17 00:00:00 2001
From: "Pavel \"LEdoian\" Turinsky" <ledoian@matfyz.cz>
Date: Tue, 26 Jan 2021 21:01:31 +0100
Subject: [PATCH 2/3] =?UTF-8?q?P=C5=99id=C3=A1n=20{{form.media}}=20rovnou?=
 =?UTF-8?q?=20do=20hlavi=C4=8Dky=20v=C5=A1eho?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Stejně je často potřeba (libovolný autocomplete) a akorát hrozí, že se
na to zapomene.
---
 mamweb/templates/base.html                          | 4 ++++
 seminar/templates/seminar/profil/edit.html          | 2 --
 seminar/templates/seminar/profil/nahraj_reseni.html | 2 --
 seminar/templates/seminar/profil/prihlaska.html     | 2 --
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/mamweb/templates/base.html b/mamweb/templates/base.html
index 039cae3a..df7e50b8 100644
--- a/mamweb/templates/base.html
+++ b/mamweb/templates/base.html
@@ -31,6 +31,10 @@
       src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.6/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
     </script>
 
+    {# Případné skripty widgetů formulářů #}
+    {% if form %}
+        {{form.media}}
+    {% endif %}
     {# script specifický pro stránku #}
     {% block script %}{% endblock %}
 
diff --git a/seminar/templates/seminar/profil/edit.html b/seminar/templates/seminar/profil/edit.html
index 803a64af..9f94090e 100644
--- a/seminar/templates/seminar/profil/edit.html
+++ b/seminar/templates/seminar/profil/edit.html
@@ -2,8 +2,6 @@
 {% load staticfiles %}
 
 {% block script %}
-    <!--script type="text/javascript" src="{% static 'admin/js/vendor/jquery/jquery.js' %}"></script!-->
-    {{form.media}}
     <script src="{% static 'seminar/prihlaska.js' %}"></script>
 {% endblock %}
 
diff --git a/seminar/templates/seminar/profil/nahraj_reseni.html b/seminar/templates/seminar/profil/nahraj_reseni.html
index 0b31aa79..92c14d28 100644
--- a/seminar/templates/seminar/profil/nahraj_reseni.html
+++ b/seminar/templates/seminar/profil/nahraj_reseni.html
@@ -1,8 +1,6 @@
 {% extends "base.html" %}
 {% load staticfiles %}
 {% block script %}
-    <!--script type="text/javascript" src="{% static 'admin/js/vendor/jquery/jquery.js' %}"></script!-->
-    {{form.media}}
     <script src="{% static 'seminar/dynamic_formsets.js' %}"></script>
 {% endblock %}
 
diff --git a/seminar/templates/seminar/profil/prihlaska.html b/seminar/templates/seminar/profil/prihlaska.html
index 22bd3385..6074e24a 100644
--- a/seminar/templates/seminar/profil/prihlaska.html
+++ b/seminar/templates/seminar/profil/prihlaska.html
@@ -2,8 +2,6 @@
 {% load staticfiles %}
 
 {% block script %}
-    <!--script type="text/javascript" src="{% static 'admin/js/vendor/jquery/jquery.js' %}"></script!-->
-    {{form.media}}
     <script src="{% static 'seminar/prihlaska.js' %}"></script>
 {% endblock %}
 

From b5efa2fe6c6e3c72c60bab132fa639136be34e37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kate=C5=99ina=20=C4=8C?= <katterrina98@gmail.com>
Date: Tue, 26 Jan 2021 21:15:36 +0100
Subject: [PATCH 3/3] odkaz na registraci na titulce

---
 seminar/templates/seminar/titulnistrana.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seminar/templates/seminar/titulnistrana.html b/seminar/templates/seminar/titulnistrana.html
index 6a323bf9..b4c9f4f6 100644
--- a/seminar/templates/seminar/titulnistrana.html
+++ b/seminar/templates/seminar/titulnistrana.html
@@ -48,7 +48,7 @@ function sousdeadline() {
   <div>
     M&amp;M je korespondenční seminář. Vydáváme časopis a v něm zajímavé podněty k přemýšlení. Ty na ně můžeš reagovat,
     experimentovat a objevovat s námi fascinující zákoutí matiky, fyziky a informatiky.
-    <a href="auth/registrace"> <div class="button"> Zaregistruj se! </div> </a> {# FIXME odkaz #}
+    <a href="prihlaska/?"> <div class="button"> Zaregistruj se! </div> </a>
     M&amp;M je taky soutěž. Za svá řešení dostaneš body a můžeš vyhrát zajímavé ceny, dostat se
     na Matfyz bez přijímaček a především, můžeš s námi jet na skvělé soustředění.
     <a href="cojemam/odmeny"> <div class="button"> Co můžeš vyhrát? </div> </a> {# FIXME odkaz #}