mam
/
mamweb
11
0
Fork 0
Code Issues Pull Requests 9 Projects Releases Wiki Activity
Browse Source

Merge branch 'test' into develop

export_seznamu_prednasek
Pavel "LEdoian" Turinsky 3 years ago
parent
c2b53f5cc5 d4717bb1d2
commit
be1a0fc56a
30 changed files with 48 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      korektury/templates/korektury/help.html
  2. 2
      korektury/templates/korektury/opraf.html
  3. 6
      korektury/templates/korektury/seskupeny_seznam.html
  4. 2
      korektury/templates/korektury/seznam.html
  5. 1
      korektury/urls.py
  6. 11
      korektury/views.py
  7. 3
      mamweb/settings_common.py
  8. 2
      mamweb/templates/400.html
  9. 2
      mamweb/templates/403.html
  10. 2
      mamweb/templates/404.html
  11. 2
      mamweb/templates/500.html
  12. 2
      mamweb/templates/admin/base_site.html
  13. 2
      mamweb/templates/base.html
  14. 2
      mamweb/templates/logo.html
  15. 2
      odevzdavatko/templates/odevzdavatko/nahraj_reseni.html
  16. 2
      odevzdavatko/templates/odevzdavatko/posli_reseni.html
  17. 2
      personalni/templates/personalni/profil/resitel.html
  18. 2
      personalni/templates/personalni/udaje/edit.html
  19. 2
      personalni/templates/personalni/udaje/prihlaska.html
  20. 2
      prednasky/admin.py
  21. 2
      prednasky/templates/prednasky/base.html
  22. 2
      prednasky/templates/prednasky/hotovo.html
  23. 16
      requirements.txt
  24. 2
      seminar/templates/seminar/archiv/obalky.tex
  25. 2
      seminar/templates/seminar/jak-resit.html
  26. 2
      seminar/templates/seminar/pracuje_se.html
  27. 2
      seminar/templates/seminar/titulnistrana.html
  28. 2
      treenode/templates/treenode/orphanage.html
  29. 2
      various/autentizace/templates/autentizace/login.html
  30. 2
      various/autentizace/templates/autentizace/logout.html

2
korektury/templates/korektury/help.html
View File

@ -1,6 +1,6 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load staticfiles %} {% load static %}
{% block title %} Nápověda ke korekturovátku {% endblock title %} {% block title %} Nápověda ke korekturovátku {% endblock title %}

2
korektury/templates/korektury/opraf.html
View File

@ -1,4 +1,4 @@
{% load staticfiles %} {% load static %}
<html> <html>
<head> <head>

6
korektury/templates/korektury/seskupeny_seznam.html
View File

@ -1,5 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load staticfiles %} {% load static %}
{% block script%} {% block script%}
<link rel="stylesheet" type="text/css" media="screen, projection" href="{% static "korektury/opraf-list.css" %}" /> <link rel="stylesheet" type="text/css" media="screen, projection" href="{% static "korektury/opraf-list.css" %}" />
@ -15,7 +15,7 @@
{% endblock nadpis1a %} {% endblock nadpis1a %}
</h1> </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 %} {% for skupina in seskupeny_list %}
{{ skupina.grouper }} {{ skupina.grouper }}
@ -32,6 +32,8 @@
<li> Nejsou žádné dokumenty ke korekturování. <li> Nejsou žádné dokumenty ke korekturování.
{% endfor %} {% endfor %}
</ul> </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 %} {% endfor %}

2
korektury/templates/korektury/seznam.html
View File

@ -1,5 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load staticfiles %} {% load static %}
{% block script%} {% block script%}
<link rel="stylesheet" type="text/css" media="screen, projection" href="{% static "korektury/opraf-list.css" %}" /> <link rel="stylesheet" type="text/css" media="screen, projection" href="{% static "korektury/opraf-list.css" %}" />

1
korektury/urls.py
View File

@ -4,6 +4,7 @@ from . import views
urlpatterns = [ urlpatterns = [
path('korektury/', org_required(views.KorekturySeskupeneListView.as_view()), name='korektury_list'), 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/zastarale/', org_required(views.KorekturyZastaraleListView.as_view()), name='korektury_stare_list'),
path('korektury/<int:pdf>/', org_required(views.KorekturyView.as_view()), name='korektury'), path('korektury/<int:pdf>/', org_required(views.KorekturyView.as_view()), name='korektury'),
] ]

11
korektury/views.py
View File

@ -41,9 +41,6 @@ class KorekturyAktualniListView(KorekturyListView):
return context return context
class KorekturySeskupeneListView(KorekturyAktualniListView):
template_name = 'korektury/seskupeny_seznam.html'
class KorekturyZastaraleListView(KorekturyListView): class KorekturyZastaraleListView(KorekturyListView):
def get_queryset(self, *args, **kwargs): def get_queryset(self, *args, **kwargs):
@ -56,6 +53,14 @@ class KorekturyZastaraleListView(KorekturyListView):
context['selected'] = 'zastarale' context['selected'] = 'zastarale'
return context 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 ### Korektury
class KorekturyView(generic.TemplateView): class KorekturyView(generic.TemplateView):
model = Oprava model = Oprava

3
mamweb/settings_common.py
View File

@ -348,4 +348,5 @@ class InvalidTemplateVariable(str):
return '' return ''
TEMPLATES[0]['OPTIONS']['string_if_invalid'] = InvalidTemplateVariable('%s') 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'

2
mamweb/templates/400.html
View File

@ -1,6 +1,6 @@
{% extends "error_base.html" %} {% extends "error_base.html" %}
{% load staticfiles %} {% load static %}
{% block errorheading %} {% block errorheading %}
O-jo-jo-jo-joj O-jo-jo-jo-joj

2
mamweb/templates/403.html
View File

@ -1,6 +1,6 @@
{% extends "error_base.html" %} {% extends "error_base.html" %}
{% load staticfiles %} {% load static %}
{% block errorheading %} {% block errorheading %}
Vrrrrrrrrr Vrrrrrrrrr

2
mamweb/templates/404.html
View File

@ -1,6 +1,6 @@
{% extends "error_base.html" %} {% extends "error_base.html" %}
{% load staticfiles %} {% load static %}
{% block errorheading %} {% block errorheading %}
Požadovaná stránka nenalezena Požadovaná stránka nenalezena

2
mamweb/templates/500.html
View File

@ -1,6 +1,6 @@
{% extends "error_base.html" %} {% extends "error_base.html" %}
{% load staticfiles %} {% load static %}
{% block errorheading %} {% block errorheading %}
O-jo-jo-jo-joj O-jo-jo-jo-joj

2
mamweb/templates/admin/base_site.html
View File

@ -1,5 +1,5 @@
{% extends "admin/base.html" %} {% extends "admin/base.html" %}
{% load staticfiles %} {% load static %}
{% block extrahead %} {% block extrahead %}
<link rel="shortcut icon" href="{% static 'favicon.ico' %}" type="image/x-icon"> <link rel="shortcut icon" href="{% static 'favicon.ico' %}" type="image/x-icon">

2
mamweb/templates/base.html
View File

@ -1,4 +1,4 @@
{% load staticfiles sekizai_tags %} {% load static sekizai_tags %}
{% load sitetree %} {% load sitetree %}
<!DOCTYPE html> <!DOCTYPE html>
<html lang='cs'> <html lang='cs'>

2
mamweb/templates/logo.html
View File

@ -1,4 +1,4 @@
{% load staticfiles %} {% load static %}
<img class="logo" <img class="logo"
{% for item in sitetree_items %} {% for item in sitetree_items %}
{% if item.is_active or item.in_current_branch %} {% if item.is_active or item.in_current_branch %}

2
odevzdavatko/templates/odevzdavatko/nahraj_reseni.html
View File

@ -1,5 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load staticfiles %} {% load static %}
{% block script %} {% block script %}
<script src="{% static 'odevzdavatko/dynamic_formsets.js' %}"></script> <script src="{% static 'odevzdavatko/dynamic_formsets.js' %}"></script>
{% endblock %} {% endblock %}

2
odevzdavatko/templates/odevzdavatko/posli_reseni.html
View File

@ -1,5 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load staticfiles %} {% load static %}
{% block script %} {% block script %}
<!--script type="text/javascript" src="{% static 'admin/js/vendor/jquery/jquery.js' %}"></script!--> <!--script type="text/javascript" src="{% static 'admin/js/vendor/jquery/jquery.js' %}"></script!-->
{{form.media}} {{form.media}}

2
personalni/templates/personalni/profil/resitel.html
View File

@ -1,5 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load staticfiles %} {% load static %}
{% block content %} {% block content %}

2
personalni/templates/personalni/udaje/edit.html
View File

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

2
personalni/templates/personalni/udaje/prihlaska.html
View File

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

2
prednasky/admin.py
View File

@ -52,7 +52,7 @@ class Seznam_PrednaskaInline(admin.TabularInline):
] ]
exclude = ['prednaska'] exclude = ['prednaska']
def has_add_permission(self, req): return False def has_add_permission(self, req, obj): return False
class SeznamAdmin(VersionAdmin): class SeznamAdmin(VersionAdmin):

2
prednasky/templates/prednasky/base.html
View File

@ -1,7 +1,7 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% load humanize %} {% load humanize %}
{% load staticfiles %} {% load static %}
{% block content %} {% block content %}

2
prednasky/templates/prednasky/hotovo.html
View File

@ -1,7 +1,7 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% load humanize %} {% load humanize %}
{% load staticfiles %} {% load static %}
{% block content %} {% block content %}

16
requirements.txt
View File

@ -1,7 +1,7 @@
-c constraints.txt -c constraints.txt
# basic libs # basic libs
psycopg2<2.9 # Kvůli djangu 2.2, odstranit při přechodu na 3. psycopg2
html5lib html5lib
ipython ipython
Pillow Pillow
@ -13,7 +13,7 @@ Unidecode
# Django and modules # Django and modules
Django<2.3 Django<3.3
#django-bootstrap-sass #django-bootstrap-sass
django-mptt django-mptt
django-reversion django-reversion
@ -34,14 +34,14 @@ django-webpack-loader
django-rest-polymorphic django-rest-polymorphic
# Comments # Comments
django-contrib-comments==1.9.0 django-contrib-comments
# debug tools/extensions # debug tools/extensions
django-debug-toolbar==1.11 django-debug-toolbar
django-extensions==2.1.9 django-extensions
sqlparse==0.2.4 sqlparse
Werkzeug==0.14.1 Werkzeug
# G+, FB authorisation # G+, FB authorisation
@ -52,7 +52,7 @@ requests
# requests-oauthlib # requests-oauthlib
# uWSGI # uWSGI
uWSGI==2.0.17.1 uWSGI
# Potřeba pro test data # Potřeba pro test data

2
seminar/templates/seminar/archiv/obalky.tex
View File

@ -1,5 +1,5 @@
{% autoescape off %} {% autoescape off %}
{% load staticfiles %} {% load static %}
{% load tex %} {% load tex %}
\documentclass[11pt,a4paper,landscape]{article} \documentclass[11pt,a4paper,landscape]{article}
\usepackage[top=3.75cm,left=8cm]{geometry} \usepackage[top=3.75cm,left=8cm]{geometry}

2
seminar/templates/seminar/jak-resit.html
View File

@ -1,7 +1,7 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% load humanize %} {% load humanize %}
{% load staticfiles %} {% load static %}
{% block content %} {% block content %}

2
seminar/templates/seminar/pracuje_se.html
View File

@ -1,4 +1,4 @@
{% load staticfiles %} {% load static %}
{% block content %} {% block content %}
<h1> <h1>

2
seminar/templates/seminar/titulnistrana.html
View File

@ -10,7 +10,7 @@ function sousdeadline() {
{% extends 'base.html' %} {% extends 'base.html' %}
{% load humanize %} {% load humanize %}
{% load staticfiles %} {% load static %}
{% block content %} {% block content %}

2
treenode/templates/treenode/orphanage.html
View File

@ -1,5 +1,5 @@
{% extends "seminar/archiv/base.html" %} {% extends "seminar/archiv/base.html" %}
{% load staticfiles %} {% load static %}
{% load sekizai_tags %} {% load sekizai_tags %}
{# toto z nejakeho duvodu nefunguje #} {# toto z nejakeho duvodu nefunguje #}

2
various/autentizace/templates/autentizace/login.html
View File

@ -1,5 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load staticfiles %} {% load static %}
{% block content %} {% block content %}

2
various/autentizace/templates/autentizace/logout.html
View File

@ -1,5 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load staticfiles %} {% load static %}
{% block content %} {% block content %}

Write Preview
Loading…
Cancel
Save