summaryrefslogtreecommitdiff
path: root/chimere/utils.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-06-23 19:57:49 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-06-23 19:57:49 +0200
commit6793ee9d4010d5b5399e8c27979d3f7d1d88f8f8 (patch)
treedefe0289658996d430c5e748a6f2ed07ce92b45e /chimere/utils.py
parenteb347add15c8c04a2e464c9153620bd41f2d0a2f (diff)
parent2808bb76a4b7ed06aacff8f5cf45e215ac95f0cf (diff)
downloadChimère-6793ee9d4010d5b5399e8c27979d3f7d1d88f8f8.tar.bz2
Chimère-6793ee9d4010d5b5399e8c27979d3f7d1d88f8f8.zip
Merge branch 'master' into v3.0
Conflicts: chimere/static/chimere/js/jquery.chimere.js
Diffstat (limited to 'chimere/utils.py')
-rw-r--r--chimere/utils.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/chimere/utils.py b/chimere/utils.py
index 11c9c4e..8096315 100644
--- a/chimere/utils.py
+++ b/chimere/utils.py
@@ -1240,9 +1240,13 @@ class HtmlXsltManager(ImportManager):
"point" not in item and not ("lat" in item and item['lat']):
return
cls = None
+ origin = self.importer_instance.origin
+ origin_lnk = item.get('link')
+ if origin_lnk:
+ origin = u"<a href='%s' target='_blank'>%s</a>" % (
+ origin_lnk, origin)
dct = {
- 'origin': "<a href='%s' target='_blank'>%s</a>" % (
- item.get('link') or '#', self.importer_instance.origin),
+ 'origin': origin,
'license': self.importer_instance.license,
'name': item['name']}
category = None