Merge pull request zostera#276 from gordon-/css_class_fix

CSS classes arguments passed to the bootstrap_form are now working

Author: Dylan Verheul

bootstrap3/renderers.py

@@ -151,6 +151,9 @@ def __init__(self, form, *args, **kwargs):
         # Handle form.empty_permitted
         if self.form.empty_permitted:
             self.set_required = False
+        self.error_css_class = kwargs.get('error_css_class', None)
+        self.required_css_class = kwargs.get('required_css_class', None)
+        self.bound_css_class = kwargs.get('bound_css_class', None)
 
     def render_fields(self):
         rendered_fields = []
@@ -169,6 +172,9 @@ def render_fields(self):
                 size=self.size,
                 horizontal_label_class=self.horizontal_label_class,
                 horizontal_field_class=self.horizontal_field_class,
+                error_css_class=self.error_css_class,
+                required_css_class=self.required_css_class,
+                bound_css_class=self.bound_css_class,
             ))
         return '\n'.join(rendered_fields)
 
@@ -232,22 +238,22 @@ def __init__(self, field, *args, **kwargs):
 
         # These are set in Django or in the global BOOTSTRAP3 settings, and
         # they can be overwritten in the template
-        error_css_class = kwargs.get('error_css_class', '')
-        required_css_class = kwargs.get('required_css_class', '')
-        bound_css_class = kwargs.get('bound_css_class', '')
-        if error_css_class:
+        error_css_class = kwargs.get('error_css_class', None)
+        required_css_class = kwargs.get('required_css_class', None)
+        bound_css_class = kwargs.get('bound_css_class', None)
+        if error_css_class is not None:
             self.error_css_class = error_css_class
         else:
             self.error_css_class = getattr(
                 field.form, 'error_css_class',
                 get_bootstrap_setting('error_css_class'))
-        if required_css_class:
+        if required_css_class is not None:
             self.required_css_class = required_css_class
         else:
             self.required_css_class = getattr(
                 field.form, 'required_css_class',
                 get_bootstrap_setting('required_css_class'))
-        if bound_css_class:
+        if bound_css_class is not None:
             self.success_css_class = bound_css_class
         else:
             self.success_css_class = getattr(

bootstrap3/tests.py

@@ -290,6 +290,51 @@ def test_buttons_tag(self):
         self.assertIn('col-md-3', res)
         self.assertIn('col-md-9', res)
 
+    def test_error_class(self):
+        form = TestForm({'sender': 'sender'})
+        res = render_template('{% bootstrap_form form %}', form=form)
+        self.assertIn('bootstrap3-err', res)
+
+        res = render_template(
+            '{% bootstrap_form form error_css_class="successful-test" %}',
+            form=form
+        )
+        self.assertIn('successful-test', res)
+
+        res = render_template('{% bootstrap_form form error_css_class="" %}',
+                              form=form)
+        self.assertNotIn('bootstrap3-err', res)
+
+    def test_required_class(self):
+        form = TestForm({'sender': 'sender'})
+        res = render_template('{% bootstrap_form form %}', form=form)
+        self.assertIn('bootstrap3-req', res)
+
+        res = render_template(
+            '{% bootstrap_form form required_css_class="successful-test" %}',
+            form=form
+        )
+        self.assertIn('successful-test', res)
+
+        res = render_template('{% bootstrap_form form required_css_class="" %}',
+                              form=form)
+        self.assertNotIn('bootstrap3-req', res)
+
+    def test_bound_class(self):
+        form = TestForm({'sender': 'sender'})
+        res = render_template('{% bootstrap_form form %}', form=form)
+        self.assertIn('bootstrap3-bound', res)
+
+        res = render_template(
+            '{% bootstrap_form form bound_css_class="successful-test" %}',
+            form=form
+        )
+        self.assertIn('successful-test', res)
+
+        res = render_template('{% bootstrap_form form bound_css_class="" %}',
+                              form=form)
+        self.assertNotIn('bootstrap3-bound', res)
+
 
 class FieldTest(TestCase):
     def test_illegal_field(self):