From 02fb2ce5f5cec7507c86a4f239281e60060320e2 Mon Sep 17 00:00:00 2001
From: Jonas Havelka <jonas.havelka@moznabude.cz>
Date: Sat, 12 Sep 2020 17:41:20 +0200
Subject: [PATCH] Autorizace v2 (snad hotovo)

---
 galerie/templates/galerie/GalerieNahled.html  |  4 ++--
 galerie/urls.py                               |  4 ++--
 seminar/templates/seminar/archiv/cislo.html   | 22 +++++++++----------
 seminar/templates/seminar/archiv/problem.html |  4 ++--
 seminar/templates/seminar/archiv/rocnik.html  |  4 ++--
 seminar/templates/seminar/novinky.html        |  6 ++---
 .../seminar/zadani/AktualniVysledkovka.html   |  2 +-
 .../seminar/zadani/AktualniZadani.html        |  6 ++---
 8 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/galerie/templates/galerie/GalerieNahled.html b/galerie/templates/galerie/GalerieNahled.html
index 7d9313fc..d1c6873e 100644
--- a/galerie/templates/galerie/GalerieNahled.html
+++ b/galerie/templates/galerie/GalerieNahled.html
@@ -61,7 +61,7 @@ Galerie {{galerie.nazev}}
             {{ galerie|truncatechars:max_delka_nazvu }}
             </div>
         </a>
-        {% if user.is_staff and galerie.zobrazit > 0 %}
+        {% if user.je_org and galerie.zobrazit > 0 %}
           <div class="mam-org-only-galerie">
             ({{galerie.poradi}})
             <span class="plus"><a href="plus/{{galerie.pk}}/">+</a></span>
@@ -73,7 +73,7 @@ Galerie {{galerie.nazev}}
       {% endwith %}
     {% endif %}
   {% endif %}
-  {% if user.is_staff and galerie.zobrazit > 0 %}
+  {% if user.je_org and galerie.zobrazit > 0 %}
   <div class="mam-org-only">
       <a href="./new">Vytvořit novou podgalerii </a>
   </div>
diff --git a/galerie/urls.py b/galerie/urls.py
index 4af34ca1..d299165f 100644
--- a/galerie/urls.py
+++ b/galerie/urls.py
@@ -8,7 +8,7 @@ urlpatterns = [
 	path('<int:pk>/', views.nahled),
 	path('<int:pk>/<int:fotka>/', views.detail),
 	path('<int:galerie>/new/', org_required(views.new_galerie)),
-	path('<int:galerie>/plus/<int:subgalerie>/', views.plus_galerie),
-	path('<int:galerie>/minus/<int:subgalerie>/', views.minus_galerie),
+	path('<int:galerie>/plus/<int:subgalerie>/', org_required(views.plus_galerie)),
+	path('<int:galerie>/minus/<int:subgalerie>/', org_required(views.minus_galerie)),
 ]
 
diff --git a/seminar/templates/seminar/archiv/cislo.html b/seminar/templates/seminar/archiv/cislo.html
index 80905e00..46c62094 100644
--- a/seminar/templates/seminar/archiv/cislo.html
+++ b/seminar/templates/seminar/archiv/cislo.html
@@ -18,9 +18,9 @@
     <h2>Zadané problémy</h2>
     <ul>
     {% for p in v_cisle_zadane %}
-      <li{% if user.is_staff and not cislo.verejne %} class='mam-org-only'{% endif %}>
-        {% if user.is_staff or cislo.verejne %}
-          <a href='{{ p.verejne_url }}'>{% endif %}{{ p.kod_v_rocniku }} {{ p.nazev }} {{ p.body_v_zavorce }}{% if user.is_staff or cislo.verejne %}</a>{% endif %}
+      <li{% if user.je_org and not cislo.verejne %} class='mam-org-only'{% endif %}>
+        {% if user.je_org or cislo.verejne %}
+          <a href='{{ p.verejne_url }}'>{% endif %}{{ p.kod_v_rocniku }} {{ p.nazev }} {{ p.body_v_zavorce }}{% if user.je_org or cislo.verejne %}</a>{% endif %}
     {% endfor %}
     </ul>
   {% endif %}
@@ -29,14 +29,14 @@
     <h2>Řešené problémy</h2>
     <ul>
     {% for p in resene_problemy %}
-      <li{% if user.is_staff and not cislo.verejne %} class='mam-org-only'{% endif %}>
-        {% if user.is_staff or cislo.verejne %}
-          <a href='{{ p.verejne_url }}'>{% endif %}{{ p.kod_v_rocniku }} {{ p.nazev }} {{ p.body_v_zavorce }}{% if user.is_staff or cislo.verejne %}</a>{% endif %}
+      <li{% if user.je_org and not cislo.verejne %} class='mam-org-only'{% endif %}>
+        {% if user.je_org or cislo.verejne %}
+          <a href='{{ p.verejne_url }}'>{% endif %}{{ p.kod_v_rocniku }} {{ p.nazev }} {{ p.body_v_zavorce }}{% if user.je_org or cislo.verejne %}</a>{% endif %}
     {% endfor %}
     </ul>
   {% endif %}
 
-  {% if user.is_staff %}
+  {% if user.je_org %}
       <div class="mam-org-only">
         <h2> Orgovské odkazy </h2>
         <ul>
@@ -52,13 +52,13 @@
   <h2>Výsledkovka</h2>
 
   {% else %}
-    {% if user.is_staff %}
+    {% if user.je_org %}
       <div class='mam-org-only'>
       <h2>Výsledkovka (neveřejná)</h2>
     {% endif %}
   {% endif %}
 
-  {% if cislo.verejna_vysledkovka or user.is_staff %}
+  {% if cislo.verejna_vysledkovka or user.je_org %}
     <table class='vysledkovka'>
       <tr class='border-b'>
         <th class='border-r'>#
@@ -66,7 +66,7 @@
         {% for p in problemy %}
         <th class='border-r'><a href="{{ p.verejne_url }}">{{ p.kod_v_rocniku }}</a>
         {% endfor %}
-        <th class='border-r'>Za číslo</sup>
+        <th class='border-r'>Za číslo
         <th class='border-r'>Za ročník
         <th class='border-r'>Odjakživa
     {% for rv in radky_vysledkovky %}
@@ -88,7 +88,7 @@
     </table>
   {% endif %}
 
-  {% if not cislo.verejna_vysledkovka and user.is_staff %}
+  {% if not cislo.verejna_vysledkovka and user.je_org %}
       </div>
   {% endif %}
 
diff --git a/seminar/templates/seminar/archiv/problem.html b/seminar/templates/seminar/archiv/problem.html
index 91c67c77..ac17353a 100644
--- a/seminar/templates/seminar/archiv/problem.html
+++ b/seminar/templates/seminar/archiv/problem.html
@@ -3,11 +3,11 @@
 {% load comments %}
 
 {% block content %}
-<div {% if not problem.verejne and user.is_staff %}class="mam-org-only"{% endif %}>
+<div {% if not problem.verejne and user.je_org %}class="mam-org-only"{% endif %}>
   {% block problem %}
   {% endblock %}
 
-  {% if user.is_staff %}
+  {% if user.je_org %}
   <div class='mam-org-only'>
 
     <h2>Text - org</h2>
diff --git a/seminar/templates/seminar/archiv/rocnik.html b/seminar/templates/seminar/archiv/rocnik.html
index 0f48b30c..da4789e2 100644
--- a/seminar/templates/seminar/archiv/rocnik.html
+++ b/seminar/templates/seminar/archiv/rocnik.html
@@ -62,7 +62,7 @@
 </div>
 
   {% if vysledkovka %}
-    {% if user.is_staff %}
+    {% if user.je_org %}
       <div class='mam-org-only'>
         <a href='vysledkovka.tex'>Výsledkovka ročníku (LaTeX)</a>
       </div>
@@ -72,7 +72,7 @@
     {% include "seminar/vysledkovka_rocnik.html" %}
   {% endif %}
 
-  {% if user.is_staff and vysledkovka_s_neverejnymi %}
+  {% if user.je_org and vysledkovka_s_neverejnymi %}
     <div class='mam-org-only'>
     <h2>Výsledková listina včetně neveřejných bodů</h2>
       {% with radky_vyledkovky_s_neverejnymi as radky_vysledkovky %}
diff --git a/seminar/templates/seminar/novinky.html b/seminar/templates/seminar/novinky.html
index ccf40831..dfcddda5 100644
--- a/seminar/templates/seminar/novinky.html
+++ b/seminar/templates/seminar/novinky.html
@@ -1,13 +1,13 @@
 {% for novinka in object_list %}
 {# pripravene div-y na stylovani#}
 <div>
-  {% if not novinka.zverejneno and user.is_staff %}
+  {% if not novinka.zverejneno and user.je_org %}
   <div class="mam-org-only">
     <ul>
       <li><a href="/admin/seminar/novinky/{{novinka.pk}}">Upravit novinku</a>
     </ul>
   {% endif %}
-  {% if novinka.zverejneno or user.is_staff %}
+  {% if novinka.zverejneno or user.je_org %}
   {# datum #}
   <div><b>{{novinka.datum}}</b></div>
   {# text #}
@@ -33,7 +33,7 @@
       </p>
   </div>
   {% endif %}
-  {% if not novinka.zverejneno and user.is_staff %}
+  {% if not novinka.zverejneno and user.je_org %}
   </div>
   {% endif %}
 </div>
diff --git a/seminar/templates/seminar/zadani/AktualniVysledkovka.html b/seminar/templates/seminar/zadani/AktualniVysledkovka.html
index 00ace94c..0f2ad4f4 100644
--- a/seminar/templates/seminar/zadani/AktualniVysledkovka.html
+++ b/seminar/templates/seminar/zadani/AktualniVysledkovka.html
@@ -27,7 +27,7 @@
     v&nbsp;<a href="/archiv/cisla/">archivu</a>.
   </p>
 
-  {% if user.is_staff and vysledkovka_s_neverejnymi %}
+  {% if user.je_org and vysledkovka_s_neverejnymi %}
     <div class='mam-org-only'>
     <h1>Výsledky včetně neveřejných</h1>
     {% with vysledkovka_s_neverejnymi as vysledkovka %}
diff --git a/seminar/templates/seminar/zadani/AktualniZadani.html b/seminar/templates/seminar/zadani/AktualniZadani.html
index 93fac9a4..31e2ca89 100644
--- a/seminar/templates/seminar/zadani/AktualniZadani.html
+++ b/seminar/templates/seminar/zadani/AktualniZadani.html
@@ -16,8 +16,8 @@
 {% with nastaveni.aktualni_cislo as ac %}
  
 {# Zobrazovani neverejnych zadani jen organizatorum #}
-{% if user.is_staff or verejne %}
-{% if user.is_staff and not verejne %}<div class="mam-org-only">{% endif %}
+{% if user.je_org or verejne %}
+{% if user.je_org and not verejne %}<div class="mam-org-only">{% endif %}
 
   {% if ac.zadane_problemy.all %}
     {% if ac.datum_deadline_soustredeni %}
@@ -60,7 +60,7 @@
 			{% endfor %}
 		{% endif %}
 
-{% if user.is_staff and not verejne%}</div>{% endif %}
+{% if user.je_org and not verejne%}</div>{% endif %}
 {% else %}
   <h2>Aktuálně nejsou zveřejněny žádné úlohy</h2>
 {% endif %}