From 1da5ecb0975fb356467bfc96934c7792afece2c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Koci=C3=A1n?= <matej.kocian@gmail.com>
Date: Thu, 10 Sep 2015 22:05:20 +0200
Subject: [PATCH] =?UTF-8?q?Vyslou=C5=BEil=C3=A9=20orgy=20=C5=99a=C4=8F=20p?=
 =?UTF-8?q?odle=20konce=20orgov=C3=A1n=C3=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seminar/templates/seminar/cojemam/organizatori.html | 12 +++++-------
 seminar/views.py                                    |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/seminar/templates/seminar/cojemam/organizatori.html b/seminar/templates/seminar/cojemam/organizatori.html
index b09ff8fa..d3b79982 100644
--- a/seminar/templates/seminar/cojemam/organizatori.html
+++ b/seminar/templates/seminar/cojemam/organizatori.html
@@ -9,14 +9,10 @@
 
 {% block content %}
 <div>
+  {% if not aktivni %}
+    <a href="/co-je-MaM/organizatori/">Aktivní organizátoři</a>
+  {% endif %}
   {% for org in object_list %}
-    <!--
-    {% if org.user.is_active %}
-      <b>Aktivní</b>
-    {% else %}
-      Není aktivní
-    {% endif %}
-    -->
     <h2>
     {{org.user.first_name}}
     {% if org.prezdivka %}
@@ -53,6 +49,8 @@
 
   {% if aktivni%}
     <a href="organizovali/">Vysloužilí organizátoři</a>
+  {% else %}
+    <a href="/co-je-MaM/organizatori/">Aktivní organizátoři</a>
   {% endif %}
 
 </div>
diff --git a/seminar/views.py b/seminar/views.py
index 6263bb34..8ca58936 100644
--- a/seminar/views.py
+++ b/seminar/views.py
@@ -65,7 +65,7 @@ class CojemamOrganizatoriView(generic.ListView):
 class CojemamOrganizatoriStariView(generic.ListView):
     model = Organizator
     template_name='seminar/cojemam/organizatori.html'
-    queryset = Organizator.objects.filter(organizuje_do_roku__isnull=False, organizuje_do_roku__lt=date.today().year).order_by('user__first_name')
+    queryset = Organizator.objects.filter(organizuje_do_roku__isnull=False, organizuje_do_roku__lt=date.today().year).order_by('-organizuje_do_roku')
 
 ### Archiv