From c526db5880373a9b4caa36e97693dd095331b421 Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Sat, 16 Jan 2021 15:01:29 +0100
Subject: [PATCH] =?UTF-8?q?Jinja:=20Form=C3=A1tova=C4=8D=20or=5Fdash?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
mo/web/jinja.py | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/mo/web/jinja.py b/mo/web/jinja.py
index 0cc2daec..30bd1fa0 100644
--- a/mo/web/jinja.py
+++ b/mo/web/jinja.py
@@ -2,6 +2,7 @@
from flask import url_for
from markupsafe import Markup
+from typing import Any
import mo.config as config
import mo.db as db
@@ -27,9 +28,14 @@ app.jinja_env.globals.update(web_flavor=config.WEB_FLAVOR)
@app.template_filter()
-def user_link(u: db.User):
+def user_link(u: db.User) -> Markup:
if u.is_admin or u.is_org:
url = url_for('org_org', id=u.user_id)
else:
url = url_for('org_user', id=u.user_id)
return Markup('<a href="{url}">{name}{test}</a>').format(url=url, name=u.full_name(), test=" (test)" if u.is_test else "")
+
+
+@app.template_filter()
+def or_dash(s: Any) -> str:
+ return str(s) if s else '–'
--
GitLab