From b3eba8b82b292d625146f816690721558f50b535 Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Fri, 24 Jan 2025 23:36:37 +0100
Subject: [PATCH] =?UTF-8?q?user=5Furl=20p=C5=99esunuto=20do=20mo.web.util?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
mo/web/jinja.py | 12 +++---------
mo/web/util.py | 7 +++++++
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/mo/web/jinja.py b/mo/web/jinja.py
index 96515a7c..2a890c51 100644
--- a/mo/web/jinja.py
+++ b/mo/web/jinja.py
@@ -17,7 +17,7 @@ from mo.util import assert_not_none
import mo.util_format as util_format
from mo.web import app
from mo.web.org_place import place_breadcrumbs
-from mo.web.util import user_html_flags
+from mo.web.util import user_html_flags, user_url
# Konfigurace Jinjy
@@ -69,20 +69,14 @@ jg.update(Right=Right)
jg.update(place_breadcrumbs=place_breadcrumbs)
# Funkce asset_url se přidává v mo.ext.assets
+jf.update(user_url=user_url)
+
@app.template_filter()
def user_link(u: db.User) -> Markup:
return Markup('<a href="{url}">{name}{test}</a>').format(url=user_url(u), name=u.full_name(), test=" (test)" if u.is_test else "")
-@app.template_filter()
-def user_url(u: db.User) -> str:
- if u.is_admin or u.is_org:
- return url_for('org_org', id=u.user_id)
- else:
- return url_for('org_user', id=u.user_id)
-
-
@app.template_filter()
def place_link(p: db.Place) -> Markup:
return Markup('<a href="{url}">{name}</a>').format(url=place_url(p), name=p.name)
diff --git a/mo/web/util.py b/mo/web/util.py
index 82a43235..63c4bb50 100644
--- a/mo/web/util.py
+++ b/mo/web/util.py
@@ -152,3 +152,10 @@ def user_html_flags(u: db.User) -> Markup:
if len(r) == 0:
return Markup("")
return Markup(" " + "".join(r))
+
+
+def user_url(u: db.User) -> str:
+ if u.is_admin or u.is_org:
+ return url_for('org_org', id=u.user_id)
+ else:
+ return url_for('org_user', id=u.user_id)
--
GitLab