Fix placeholder on bootstrap_field (fix zostera#263)

Author: dyve

bootstrap3/renderers.py

@@ -232,10 +232,14 @@ def __init__(self, field, *args, **kwargs):
         self.field_help = text_value(mark_safe(field.help_text)) if self.show_help and field.help_text else ''
         self.field_errors = [conditional_escape(text_value(error)) for error in field.errors]
 
-        self.placeholder = kwargs.get("placeholder", "")
-        if get_bootstrap_setting('set_placeholder'):
+        if 'placeholder' in kwargs:
+            # Find the placeholder in kwargs, even if it's empty
+            self.placeholder = kwargs['placeholder']
+        elif get_bootstrap_setting('set_placeholder'):
+            # If not found, see if we set the label
             self.placeholder = field.label
         else:
+            # Or just set it to empty
             self.placeholder = ''
 
         self.addon_before = kwargs.get('addon_before', self.widget.attrs.pop('addon_before', ''))

demo/demo/templates/demo/form_by_field.html

@@ -12,6 +12,7 @@
         {% csrf_token %}
         {% bootstrap_form_errors form type='non_fields' %}
         {% bootstrap_field form.subject layout='horizontal' size='sm' %}
+        {% bootstrap_field form.message placeholder='bonkers' %}
         {% buttons submit='OK' reset="Cancel" %}{% endbuttons %}
     </form>