fix #303: link tags in TextImagePlugin not rendered correctly

jrief · Nov 23, 2018 · ef1ea22 · ef1ea22
1 parent a2622d1
commit ef1ea22
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/cmsplugin_cascade/generic/cms_plugins.py b/cmsplugin_cascade/generic/cms_plugins.py
@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 
 from django.forms import widgets, ModelChoiceField
-from django.utils.html import format_html
+from django.utils.html import format_html, format_html_join
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext_lazy as _
 
@@ -216,7 +216,12 @@ def render(self, context, instance, placeholder):
             'subject_location': subject_location,
             'high_resolution': high_resolution,
         }
-        context.update(dict(instance=instance, placeholder=placeholder, src=src))
+        link_attributes = LinkPluginBase.get_html_tag_attributes(instance)
+        link_html_tag_attributes = format_html_join(' ', '{0}="{1}"',
+            [(attr, val) for attr, val in link_attributes.items() if val]
+        )
+        context.update(dict(instance=instance, placeholder=placeholder, src=src,
+                            link_html_tag_attributes=link_html_tag_attributes))
         return context
 
 plugin_pool.register_plugin(TextImagePlugin)
diff --git a/cmsplugin_cascade/templates/cascade/plugins/textimage.html b/cmsplugin_cascade/templates/cascade/plugins/textimage.html
@@ -1,7 +1,7 @@
 {% load thumbnail %}
 {% spaceless %}
 {% with css_classes=instance.css_classes inline_styles=instance.inline_styles instance_link=instance.link %}
-{% if instance_link %}<a href="{{ instance_link }}" {{ instance.html_tag_attributes }}>{% endif %}
+{% if instance_link %}<a href="{{ instance_link }}" {{ link_html_tag_attributes }}>{% endif %}
 <img {{ instance.html_tag_attributes }}{% if css_classes %} class="{{ css_classes }}"{% endif %}{% if inline_styles %} style="{{ inline_styles }}"{% endif %}
 	{% thumbnail instance.image src.size crop=src.crop upscale=src.upscale subject_location=src.subject_location as thumb %}
 	src="{{ thumb.url }}" width="{{ thumb.width }}" height="{{ thumb.height }}"