diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-21 18:24:45 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-21 18:24:45 +0200 |
| commit | 17479a7ffb3d02b25cd97937e051b683524c61bd (patch) | |
| tree | f0a3560dc617bd1449169468aacbc3596131ab72 | |
| parent | 46698118b56b698b6958fb77dd9daa948d09ba65 (diff) | |
| parent | 9df8d80d695dc98318aad7ffdc280b9b13d67542 (diff) | |
| download | Ishtar-17479a7ffb3d02b25cd97937e051b683524c61bd.tar.bz2 Ishtar-17479a7ffb3d02b25cd97937e051b683524c61bd.zip | |
Merge branch 'master' into master-gis
| -rw-r--r-- | ishtar_common/templatetags/window_field.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ishtar_common/templatetags/window_field.py b/ishtar_common/templatetags/window_field.py index 9ce2cf6b6..73e944c0f 100644 --- a/ishtar_common/templatetags/window_field.py +++ b/ishtar_common/templatetags/window_field.py @@ -20,9 +20,11 @@ def field_li(caption, data, pre_data='', post_data=''): @register.inclusion_tag('ishtar/blocks/window_field_url.html') def field_url(caption, link, link_name='', li=False): + if link: + link = link.strip() if not link: return u'' - if not link.startswith('http://'): + if not link.startswith('http://') or not link.startswith('https://'): link = 'http://' + link return {'caption': caption, 'link': link, "link_name": link_name, 'li': li} |