Merge branch 'master' of git.fsmpi.rwth-aachen.de:protokollsystem/proto3

templates/decision.tex

@@ -5,7 +5,9 @@
 \usepackage{pdfpages}
 \usepackage{eurosym}
 %\usepackage[utf8]{inputenc}
-\usepackage[pdfborder={0 0 0}]{hyperref}
+\usepackage[hyphens]{url}
+\usepackage[pdfborder={0 0 0},breaklinks=true]{hyperref}
+\def\UrlBreaks{\do\/\do-\do\&\do.\do,\do;\do\_\do?\do\#}
 %\usepackage{ngerman}
 % \usepackage[left]{lineno}
 %\usepackage{footnote}

views/tables.py

@@ -306,7 +306,8 @@ class ProtocolTypeTable(SingleValueTable):
         if _latex_templates is not None:
             latex_template_part = [
                 _latex_templates[self.value.latex_template]['name']
-                if self.value.latex_template is not (None or "")
+                if (self.value.latex_template is not None
+                    and self.value.latex_template != "")
                 else "Standardvorlage"]
         else:
             latex_template_part = []