Merge branch 'release/6.2.2'

zostera · Aug 20, 2015 · 9a0e746 · 9a0e746
2 parents 3affc19 + 676be95
commit 9a0e746
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 2 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -3,6 +3,12 @@
 History
 -------
 
+6.2.2 (2015-08-20)
+++++++++++++++++++
+
+* Bug fix for escaped icons in buttons (reported by @jlec)
+
+
 6.2.1 (2015-08-19)
 ++++++++++++++++++
 

diff --git a/bootstrap3/__init__.py b/bootstrap3/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '6.2.1'
+__version__ = '6.2.2'
diff --git a/bootstrap3/forms.py b/bootstrap3/forms.py
@@ -120,7 +120,7 @@ def render_button(
     return render_tag(
         tag,
         attrs=attrs,
-        content=text_concat(icon_content, content, separator=' '),
+        content=mark_safe(text_concat(icon_content, content, separator=' ')),
     )
 
 

diff --git a/bootstrap3/tests.py b/bootstrap3/tests.py
@@ -530,3 +530,12 @@ def test_for_formset(self):
             formset=test_formset
         )
         self.assertIn('sr-only', res)
+
+    def test_button_with_icon(self):
+        res = render_template(
+            "{% bootstrap_button 'test' icon='info-sign' %}"
+        )
+        self.assertEqual(
+            res.strip(),
+            '<button class="btn"><span class="glyphicon glyphicon-info-sign"></span> test</button>'
+        )
diff --git a/demo/demo/templates/demo/misc.html b/demo/demo/templates/demo/misc.html
@@ -10,6 +10,8 @@
 
     {% bootstrap_button 'button' size='lg' %}
 
+    {% bootstrap_button 'button' size='lg' icon='info-sign' %}
+
     {% bootstrap_alert "Something went wrong" alert_type='danger' %}
 
 {% endblock %}