user_url přesunuto do mo.web.util

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)

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)