Merge branch 'data_migrations' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into data_migrations

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 %}
 

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 %}
 

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 %}
 

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 %}
 

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