diff --git a/korektury/templates/korektury/base.html b/korektury/templates/korektury/base.html
index b31d5d47..886a15e1 100644
--- a/korektury/templates/korektury/base.html
+++ b/korektury/templates/korektury/base.html
@@ -1,5 +1,9 @@
{% extends "base.html" %}
+{% block submenu %}
+ {% include "korektury/submenu.html" %}
+{% endblock %}
+
{% block content %}
{# blok do kterého se nacita text, v pripade jinyhc templatu obalit vlastnim blokem #}
{% endblock %}
diff --git a/korektury/templates/korektury/help.html b/korektury/templates/korektury/help.html
index 0024848e..f2ddafb9 100644
--- a/korektury/templates/korektury/help.html
+++ b/korektury/templates/korektury/help.html
@@ -1,4 +1,11 @@
{% extends "korektury/base.html" %}
+
+{% block submenu %}
+ {% with "help" as selected %}
+ {% include "korektury/submenu.html" %}
+ {% endwith %}
+{% endblock %}
+
{% load staticfiles %}
{% block title %} Nápověda ke korigovátku {% endblock title %}
diff --git a/korektury/templates/korektury/seznam.html b/korektury/templates/korektury/seznam.html
index 7531679b..2498fbce 100644
--- a/korektury/templates/korektury/seznam.html
+++ b/korektury/templates/korektury/seznam.html
@@ -1,6 +1,10 @@
{% extends "korektury/base.html" %}
{% load staticfiles %}
+{% block submenu %}
+ {% include "korektury/submenu.html" %}
+{% endblock %}
+
{% block script%}
{% endblock %}
diff --git a/korektury/templates/korektury/submenu.html b/korektury/templates/korektury/submenu.html
new file mode 100644
index 00000000..0a5ed988
--- /dev/null
+++ b/korektury/templates/korektury/submenu.html
@@ -0,0 +1,13 @@
+{% with "/korektury" as cesta %}
+
+
+
+{% endwith %}
+
+
diff --git a/korektury/urls.py b/korektury/urls.py
index 2f131516..ecad4804 100644
--- a/korektury/urls.py
+++ b/korektury/urls.py
@@ -6,7 +6,8 @@ from . import views
staff_member_required = user_passes_test(lambda u: u.is_staff)
urlpatterns = [
- url(r'^korektury/$', staff_member_required(views.KorekturyListView.as_view()), name='korektury-list'),
+ url(r'^korektury/$', staff_member_required(views.KorekturyAktualniListView.as_view()), name='korektury-list'),
+ url(r'^korektury/zastarale/$', staff_member_required(views.KorekturyZastaraleListView.as_view()), name='korektury-list-zastarale'),
url(r'^korektury/(?P\d+)/$', staff_member_required(views.KorekturyView.as_view()), name='korektury'),
url(r'^korektury/help/', staff_member_required(views.KorekturyHelpView.as_view()), name='korektury-help'),
]
diff --git a/korektury/views.py b/korektury/views.py
index 1e5a9298..56f198f2 100644
--- a/korektury/views.py
+++ b/korektury/views.py
@@ -21,6 +21,28 @@ class KorekturyListView(generic.ListView):
model = KorekturovanePDF
template_name = 'korektury/seznam.html'
+class KorekturyAktualniListView(KorekturyListView):
+ def get_queryset(self, *args, **kwargs):
+ queryset=super(KorekturyAktualniListView,self).get_queryset()
+ queryset=queryset.exclude(status="zastarale")
+ return queryset
+
+ def get_context_data(self, **kwargs):
+ context = super(KorekturyAktualniListView,self).get_context_data(**kwargs)
+ context['selected'] = 'aktualni'
+ return context
+
+class KorekturyZastaraleListView(KorekturyListView):
+ def get_queryset(self, *args, **kwargs):
+ queryset=super(KorekturyZastaraleListView,self).get_queryset()
+ queryset=queryset.filter(status="zastarale")
+ return queryset
+
+ def get_context_data(self, **kwargs):
+ context = super(KorekturyZastaraleListView,self).get_context_data(**kwargs)
+ context['selected'] = 'zastarale'
+ return context
+
### Korektury
class KorekturyView(generic.TemplateView):
model = Oprava
diff --git a/seminar/management/commands/auth.py b/seminar/management/commands/auth.py
index 1aa504dd..71757418 100644
--- a/seminar/management/commands/auth.py
+++ b/seminar/management/commands/auth.py
@@ -1,17 +1,17 @@
# -*- coding: utf-8 -*-
-from django.core.management.base import NoArgsCommand
+from django.core.management.base import BaseCommand
from django.contrib.sessions.models import Session
from django.contrib.auth.models import User
-class Command(NoArgsCommand):
+class Command(BaseCommand):
u"""Vypiš username přihlášeného orga s daným session_key.
Příkaz pro manage.py, který ze vstupu přečte session_key (tak, jak je
uložen v cookie sessionid) a pokud session existuje a příslušný přihlášený
uživatel má právo přihlásit se do admina, vypíše jeho username.
"""
- def handle_noargs(self, **options):
+ def handle(self, *args, **options):
session_key = raw_input()
s = Session.objects.get(pk=session_key).get_decoded()
user_id = s['_auth_user_id']
diff --git a/seminar/management/commands/testdata.py b/seminar/management/commands/testdata.py
index dda7b097..9f38ab57 100644
--- a/seminar/management/commands/testdata.py
+++ b/seminar/management/commands/testdata.py
@@ -4,7 +4,7 @@ import datetime
import os
import random
-from django.core.management.base import NoArgsCommand
+from django.core.management.base import BaseCommand
from django.core.management import call_command
from django.conf import settings
@@ -14,10 +14,10 @@ import django.contrib.auth
User = django.contrib.auth.get_user_model()
-class Command(NoArgsCommand):
+class Command(BaseCommand):
help = "Clear database and load testing data."
- def handle_noargs(self, **options):
+ def handle(self, *args, **options):
assert settings.DEBUG == True
dbfile = settings.DATABASES['default']['NAME']
if os.path.exists(dbfile):