From c92b0ea4e0c64e62ac9843bb334eee6f3d80d0ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kate=C5=99ina=20=C4=8C?= Date: Tue, 23 Feb 2021 22:36:57 +0100 Subject: [PATCH 1/2] =?UTF-8?q?if=20obr=C3=A1zek=20u=20=C4=8D=C3=ADsla=20v?= =?UTF-8?q?=20archivu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/templates/seminar/archiv/cislo.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/seminar/templates/seminar/archiv/cislo.html b/seminar/templates/seminar/archiv/cislo.html index a875caba..677c074d 100644 --- a/seminar/templates/seminar/archiv/cislo.html +++ b/seminar/templates/seminar/archiv/cislo.html @@ -46,17 +46,17 @@ {% endif %} -
-
{% if cislo.titulka_nahled %} +
+
Titulní {% elif cislo.pdf %} - Číslo v pdf - {% endif %} + Číslo v pdf
+
+ {% endif %} -
{% comment %} From 970d363689fccbd357ac4054e7adffa32de65423 Mon Sep 17 00:00:00 2001 From: "Pavel \"LEdoian\" Turinsky" Date: Tue, 23 Feb 2021 23:28:33 +0100 Subject: [PATCH 2/2] Fix .je_org a .je_resitel --- seminar/utils.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/seminar/utils.py b/seminar/utils.py index 47d5027c..e3d87020 100644 --- a/seminar/utils.py +++ b/seminar/utils.py @@ -17,10 +17,11 @@ import seminar.treelib as t org_required = permission_required('auth.org', raise_exception=True) resitel_required = permission_required('auth.resitel', raise_exception=True) User = get_user_model() -User.je_org = lambda self: self.has_perm('auth.org') -User.je_resitel = lambda self: self.has_perm('auth.resitel') -AnonymousUser.je_org = lambda self: False -AnonymousUser.je_resitel = lambda self: False +# Není to úplně hezké, ale budeme doufat, že to je funkční... +User.je_org = property(lambda self: self.has_perm('auth.org')) +User.je_resitel = property(lambda self: self.has_perm('auth.resitel')) +AnonymousUser.je_org = False +AnonymousUser.je_resitel = False class FirstTagParser(HTMLParser):