From 2ad3c425f7715ba23a5e1e33cace0bc431973d66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kate=C5=99ina=20=C4=8C=C3=AD=C5=BEkov=C3=A1?=
 <katterrina98@gmail.com>
Date: Thu, 25 Jul 2019 21:20:15 +0200
Subject: [PATCH] =?UTF-8?q?opraveno=20zobrazen=C3=AD=20seznamu=20organiz?=
 =?UTF-8?q?=C3=A1tor=C5=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../seminar/cojemam/organizatori.html         | 26 +++++++++----------
 seminar/views.py                              |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/seminar/templates/seminar/cojemam/organizatori.html b/seminar/templates/seminar/cojemam/organizatori.html
index 4f3709a4..0b9c62ac 100644
--- a/seminar/templates/seminar/cojemam/organizatori.html
+++ b/seminar/templates/seminar/cojemam/organizatori.html
@@ -25,40 +25,40 @@
   {% endif %}
   {% for org in object_list %}
     <h1>
-    {{org.user.first_name}}
+    {{org.osoba.jmeno}}
     {% if org.prezdivka %}
-      &bdquo;{{org.prezdivka}}&ldquo;
+      &bdquo;{{org.osoba.prezdivka}}&ldquo;
     {% endif %}
-    {{org.user.last_name}}
+    {{org.osoba.prijmeni}}
     </h1>
     <table>
     <tr>
     <td>
     <div class="foto_org">
-    {% if org.foto %}
-      {# <img src="{{org.foto.url}}" height="{{org.foto.height}}"> #}
-      <a href="{{org.foto.url}}"><img src="{{org.foto_male.url}}" height="{{org.foto_male.height}}" alt="{{org.user.first_name}} {{org.user.last_name}}"></a>
+    {% if org.osoba.foto %}
+      {# <img src="{{org.osoba.foto.url}}" height="{{org.osoba.foto.height}}"> #}
+      <a href="{{org.osoba.foto.url}}"><img src="{{org.osoba.foto_male.url}}" height="{{org.osoba.foto_male.height}}" alt="{{org.osoba.jmeno}} {{org.osoba.prijmeni}}"></a>
     {% endif %}
     </div>
     </td>
     <td>
     <ul>
           {% if aktivni %}
-            {% if org.organizuje_od_roku %}
+            {% if org.organizuje_od %}
               <li>
-                Organizuje od roku {{org.organizuje_od_roku}}
+                Organizuje od roku {{org.organizuje_od}}
             {% endif %}
           {% else %}
             <li>
-              Aktivní v letech {{org.organizuje_od_roku | default:"?" }}&ndash;{{org.organizuje_do_roku | default:"?" }}
+              Aktivní v letech {{org.organizuje_od | default:"?" }}&ndash;{{org.organizuje_do | default:"?" }}
           {% endif %}
-      {% if org.studuje %}
-        <li>{{org.studuje}}
+      {% if org.skola %}
+        <li>{{org.studuje}} na {{org.skola}}
       {% endif %}
-      {% if org.user.email %}
+      {% if org.osoba.email %}
         <li>Pošta:
         {# zobrazeni e-mailu (na jednom radku, aby nevznikaly mezery navic) #}
-        {% for znak in org.user.email %}{% if znak == '@' %} &#60;zavináč&#62; {% elif znak == '.' %} &#60;tečka&#62; {% else %}{{znak}}{% endif %}{% endfor %}
+        {% for znak in org.osoba.email %}{% if znak == '@' %} &#60;zavináč&#62; {% elif znak == '.' %} &#60;tečka&#62; {% else %}{{znak}}{% endif %}{% endfor %}
       {% endif %}
     </ul>
     {# {{org.strucny_popis_organizatora}} #}
diff --git a/seminar/views.py b/seminar/views.py
index 7ac0701e..42d8b388 100644
--- a/seminar/views.py
+++ b/seminar/views.py
@@ -146,7 +146,7 @@ def aktivniOrganizatori(datum=date.today()):
 	return Organizator.objects.exclude(
 		organizuje_do__isnull=False,
 		organizuje_do__lt=datum
-	).order_by('user__first_name')
+	).order_by('osoba__jmeno')
 
 
 class CojemamOrganizatoriView(generic.ListView):