Merge pull request #271 from Grelek/feature-label_empty_string

Don't escape HTML entity for space
zostera · Aug 17, 2015 · fa53d69 · fa53d69
2 parents bbc2610 + 970946c
commit fa53d69
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/bootstrap3/forms.py b/bootstrap3/forms.py
@@ -7,6 +7,7 @@
     PasswordInput
 )
 from django.forms.widgets import CheckboxInput
+from django.utils.safestring import mark_safe
 
 from .bootstrap import (
     get_bootstrap_setting, get_form_renderer, get_field_renderer,
@@ -135,7 +136,7 @@ def render_field_and_label(
         if not field_class:
             field_class = get_bootstrap_setting('horizontal_field_class')
         if not label:
-            label = '&#160;'
+            label = mark_safe('&#160;')
         label_class = add_css_class(label_class, 'control-label')
     html = field
     if field_class:

diff --git a/bootstrap3/renderers.py b/bootstrap3/renderers.py
@@ -455,7 +455,7 @@ def get_label(self):
         else:
             label = self.field.label
         if self.layout == 'horizontal' and not label:
-            return '&#160;'
+            return mark_safe('&#160;')
         return label
 
     def add_label(self, html):