Merge branch 'master' of github.com:hasgeek/baseframe into filter-cle…

…anurl
hasgeek · Aug 25, 2020 · 85c22df · 85c22df
2 parents 2d20465 + 66d1f1c
commit 85c22df
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/baseframe/__init__.py b/baseframe/__init__.py
@@ -15,6 +15,7 @@
 from flask_babelhg import Babel, Domain, ctx_has_locale
 from speaklater import is_lazy_string
 
+from babel import Locale
 from flask_caching import Cache
 from furl import furl
 from pytz import UTC, timezone
@@ -111,6 +112,8 @@ def default(self, o):
             return o.zone
         if isinstance(o, (date, datetime, time)):
             return o.isoformat()
+        if isinstance(o, Locale):
+            return str(o)
         if isinstance(o, abc.Mapping):
             return dict(o)
         if isinstance(o, furl):

diff --git a/baseframe/filters.py b/baseframe/filters.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import unicode_literals
+from six.moves.urllib.parse import urlsplit, urlunsplit
 import six
 
 from datetime import datetime, timedelta
@@ -293,3 +294,9 @@ def cleanurl_filter(url):
         url = furl(url)
     url.path.normalize()
     return furl().set(netloc=url.netloc, path=url.path).url.lstrip('//').rstrip('/')
+
+
+@baseframe.app_template_filter('make_relative_url')
+def make_relative_url(url):
+    """Filter to discard scheme and netloc from a URL, used to undo _external=True"""
+    return urlunsplit(urlsplit(url)._replace(scheme='', netloc=''))
diff --git a/baseframe/templates/baseframe/mui/components.html.jinja2 b/baseframe/templates/baseframe/mui/components.html.jinja2
@@ -1,5 +1,5 @@
 {%- macro faicon(icon, icon_size='body', baseline=true, css_class='') -%}
-  {% assets "fa5-sprite" %}<svg class="fa5-icon {%- if icon_size %} fa5-icon--{{icon_size}} {%- endif -%} {%- if baseline %} fa5--align-baseline {%- endif -%} {%- if css_class %} {{ css_class }} {%- endif -%}" aria-hidden="true" role="img"><use xlink:href="{{ ASSET_URL }}#{{icon}}"></use></svg>{% endassets %}
+  {% assets "fa5-sprite" %}<svg class="fa5-icon {%- if icon_size %} fa5-icon--{{icon_size}} {%- endif -%} {%- if baseline %} fa5--align-baseline {%- endif -%} {%- if css_class %} {{ css_class }} {%- endif -%}" aria-hidden="true" role="img"><use xlink:href="{{ ASSET_URL|make_relative_url }}#{{icon}}"></use></svg>{% endassets %}
 {%- endmacro %}
 
 {%- macro alertbox(category, message="") %}