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

2 years ago · b750a352dd
30 changed files with 48 additions and 39 deletions
--- a/korektury/templates/korektury/help.html
+++ b/korektury/templates/korektury/help.html
@ -1,6 +1,6 @@
 {% extends "base.html" %}

-{% load staticfiles %}
+{% load static %}


 {% block content %}
--- a/korektury/templates/korektury/opraf.html
+++ b/korektury/templates/korektury/opraf.html
@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}

 <html>
 <head>
--- a/korektury/templates/korektury/seskupeny_seznam.html
+++ b/korektury/templates/korektury/seskupeny_seznam.html
@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}

 {% block script%}
  <link rel="stylesheet" type="text/css" media="screen, projection" href="{% static "korektury/opraf-list.css" %}" />
@ -13,7 +13,7 @@
 {% endblock nadpis1a %}
 </h1>

-{% regroup object_list|dictsortreversed:"cislo_a_tema" by cislo_a_tema as seskupeny_list %}
+{% regroup object_list by cislo_a_tema as seskupeny_list %}

 {% for skupina in seskupeny_list %}
 {{ skupina.grouper }}
@ -30,6 +30,8 @@
    <li> Nejsou žádné dokumenty ke korekturování.
  {% endfor %}
 </ul>
+{% empty %}
+<p>Nejspíš se nepodařilo seskupit korektury podle čísel. Napiš prosím webařům a mezitím použij <a href="{% url 'korektury_neseskupene_list' %}">neseskupený seznam</a>.</p>
 {% endfor %}


--- a/korektury/templates/korektury/seznam.html
+++ b/korektury/templates/korektury/seznam.html
@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}

 {% block script%}
  <link rel="stylesheet" type="text/css" media="screen, projection" href="{% static "korektury/opraf-list.css" %}" />
--- a/korektury/urls.py
+++ b/korektury/urls.py
@ -4,6 +4,7 @@ from . import views

 urlpatterns = [
 	path('korektury/', org_required(views.KorekturySeskupeneListView.as_view()), name='korektury_list'),
+	path('korektury/neseskupene/', org_required(views.KorekturyAktualniListView.as_view()), name='korektury_neseskupene_list'),
 	path('korektury/zastarale/', org_required(views.KorekturyZastaraleListView.as_view()), name='korektury_stare_list'),
 	path('korektury/<int:pdf>/', org_required(views.KorekturyView.as_view()), name='korektury'),
 ]
--- a/korektury/views.py
+++ b/korektury/views.py
@ -41,9 +41,6 @@ class KorekturyAktualniListView(KorekturyListView):
        return context


-class KorekturySeskupeneListView(KorekturyAktualniListView):
-    template_name = 'korektury/seskupeny_seznam.html'
-

 class KorekturyZastaraleListView(KorekturyListView):
    def get_queryset(self, *args, **kwargs):
@ -56,6 +53,14 @@ class KorekturyZastaraleListView(KorekturyListView):
        context['selected'] = 'zastarale'
        return context

+class KorekturySeskupeneListView(KorekturyAktualniListView):
+	template_name = 'korektury/seskupeny_seznam.html'
+
+	# {% regroup %} potřebuje dostat správně setříděné názvy, aby nedělal duplikáty
+	def get_queryset(self, *args, **kwargs):
+		qs = super().get_queryset(**kwargs)
+		return qs.order_by('nazev')
+
 ### Korektury
 class KorekturyView(generic.TemplateView):
 	model = Oprava
--- a/mamweb/settings_common.py
+++ b/mamweb/settings_common.py
@ -348,4 +348,5 @@ class InvalidTemplateVariable(str):
        return ''
 TEMPLATES[0]['OPTIONS']['string_if_invalid'] = InvalidTemplateVariable('%s')

-
+# Django 3.2 vyžaduje explicitní nastavení autoklíče, zatím nechápu proč
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
--- a/mamweb/templates/400.html
+++ b/mamweb/templates/400.html
@ -1,6 +1,6 @@
 {% extends "error_base.html" %}

-{% load staticfiles %}
+{% load static %}

 {% block errorheading %}
      O-jo-jo-jo-joj
--- a/mamweb/templates/403.html
+++ b/mamweb/templates/403.html
@ -1,6 +1,6 @@
 {% extends "error_base.html" %}

-{% load staticfiles %}
+{% load static %}

 {% block errorheading %}
      Vrrrrrrrrr
--- a/mamweb/templates/404.html
+++ b/mamweb/templates/404.html
@ -1,6 +1,6 @@
 {% extends "error_base.html" %}

-{% load staticfiles %}
+{% load static %}

 {% block errorheading %}
 Požadovaná stránka nenalezena
--- a/mamweb/templates/500.html
+++ b/mamweb/templates/500.html
@ -1,6 +1,6 @@
 {% extends "error_base.html" %}

-{% load staticfiles %}
+{% load static %}

 {% block errorheading %}
      O-jo-jo-jo-joj
--- a/mamweb/templates/admin/base_site.html
+++ b/mamweb/templates/admin/base_site.html
@ -1,5 +1,5 @@
 {% extends "admin/base.html" %}
-{% load staticfiles %}
+{% load static %}

 {% block extrahead %}
 <link rel="shortcut icon" href="{% static 'favicon.ico' %}" type="image/x-icon">
--- a/mamweb/templates/base.html
+++ b/mamweb/templates/base.html
@ -1,4 +1,4 @@
-{% load staticfiles sekizai_tags %}
+{% load static sekizai_tags %}
 {% load sitetree %}
 <!DOCTYPE html>
 <html lang='cs'>
--- a/mamweb/templates/logo.html
+++ b/mamweb/templates/logo.html
@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 <img class="logo"
    {% for item in sitetree_items %}
        {% if item.is_active or item.in_current_branch %}
--- a/odevzdavatko/templates/odevzdavatko/nahraj_reseni.html
+++ b/odevzdavatko/templates/odevzdavatko/nahraj_reseni.html
@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% block script %}
    <script src="{% static 'odevzdavatko/dynamic_formsets.js' %}"></script>
 {% endblock %}
--- a/odevzdavatko/templates/odevzdavatko/posli_reseni.html
+++ b/odevzdavatko/templates/odevzdavatko/posli_reseni.html
@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% block script %}
    <!--script type="text/javascript" src="{% static 'admin/js/vendor/jquery/jquery.js' %}"></script!-->
    {{form.media}}
--- a/personalni/templates/personalni/profil/resitel.html
+++ b/personalni/templates/personalni/profil/resitel.html
@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}


 {% block content %}
--- a/personalni/templates/personalni/udaje/edit.html
+++ b/personalni/templates/personalni/udaje/edit.html
@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}

 {% block script %}
    <script src="{% static 'personalni/prihlaska.js' %}"></script>
--- a/personalni/templates/personalni/udaje/prihlaska.html
+++ b/personalni/templates/personalni/udaje/prihlaska.html
@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}

 {% block script %}
    <script src="{% static 'personalni/prihlaska.js' %}"></script>
--- a/prednasky/admin.py
+++ b/prednasky/admin.py
@ -52,7 +52,7 @@ class Seznam_PrednaskaInline(admin.TabularInline):
 	]
 	exclude = ['prednaska']

-	def has_add_permission(self, req): return False
+	def has_add_permission(self, req, obj): return False


 class SeznamAdmin(VersionAdmin):
--- a/prednasky/templates/prednasky/base.html
+++ b/prednasky/templates/prednasky/base.html
@ -1,7 +1,7 @@
 {% extends 'base.html' %}

 {% load humanize %}
-{% load staticfiles %}
+{% load static %}


 {% block content %}
--- a/prednasky/templates/prednasky/hotovo.html
+++ b/prednasky/templates/prednasky/hotovo.html
@ -1,7 +1,7 @@
 {% extends 'base.html' %}

 {% load humanize %}
-{% load staticfiles %}
+{% load static %}


 {% block content %}
--- a/requirements.txt
+++ b/requirements.txt
@ -1,7 +1,7 @@
 -c constraints.txt
 # basic libs

-psycopg2<2.9 # Kvůli djangu 2.2, odstranit při přechodu na 3.
+psycopg2
 html5lib
 ipython
 Pillow
@ -13,7 +13,7 @@ Unidecode

 # Django and modules

-Django<2.3
+Django<3.3
 #django-bootstrap-sass
 django-mptt
 django-reversion
@ -34,14 +34,14 @@ django-webpack-loader
 django-rest-polymorphic

 # Comments
-django-contrib-comments==1.9.0
+django-contrib-comments

 # debug tools/extensions

-django-debug-toolbar==1.11
-django-extensions==2.1.9
-sqlparse==0.2.4
-Werkzeug==0.14.1
+django-debug-toolbar
+django-extensions
+sqlparse
+Werkzeug

 # G+, FB authorisation

@ -52,7 +52,7 @@ requests
 # requests-oauthlib

 # uWSGI
-uWSGI==2.0.17.1
+uWSGI

 # Potřeba pro test data

--- a/seminar/templates/seminar/archiv/obalky.tex
+++ b/seminar/templates/seminar/archiv/obalky.tex
@ -1,5 +1,5 @@
 {% autoescape off %}
-{% load staticfiles %}
+{% load static %}
 {% load tex %}
 \documentclass[11pt,a4paper,landscape]{article}
 \usepackage[top=3.75cm,left=8cm]{geometry}
--- a/seminar/templates/seminar/jak-resit.html
+++ b/seminar/templates/seminar/jak-resit.html
@ -1,7 +1,7 @@
 {% extends 'base.html' %}

 {% load humanize %}
-{% load staticfiles %}
+{% load static %}


 {% block content %}
--- a/seminar/templates/seminar/pracuje_se.html
+++ b/seminar/templates/seminar/pracuje_se.html
@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}

 {% block content %}
  <h1>
--- a/seminar/templates/seminar/titulnistrana.html
+++ b/seminar/templates/seminar/titulnistrana.html
@ -10,7 +10,7 @@ function sousdeadline() {
 {% extends 'base.html' %}

 {% load humanize %}
-{% load staticfiles %}
+{% load static %}


 {% block content %}
--- a/treenode/templates/treenode/orphanage.html
+++ b/treenode/templates/treenode/orphanage.html
@ -1,5 +1,5 @@
 {% extends "seminar/archiv/base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load sekizai_tags %}

 {# toto z nejakeho duvodu nefunguje #}
--- a/various/autentizace/templates/autentizace/login.html
+++ b/various/autentizace/templates/autentizace/login.html
@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}


 {% block content %}
--- a/various/autentizace/templates/autentizace/logout.html
+++ b/various/autentizace/templates/autentizace/logout.html
@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}


 {% block content %}