Fix zostera#170, fix zostera#318

Author: dyve

HISTORY.rst

@@ -6,8 +6,10 @@ History
 Develop
 +++++++
 
+* Fix handling of error class (#170)
 * Remove everything to do with setting HTML `required` attribute (#337)
 * Remove everything to do with setting HTML `disabled` attribute (#345)
+* No size class for checkboxes (#318, thanks @cybojenix)
 * Fix warnings during install (thanks @mfcovington)
 * Add subresource integrity to external components (thanks @mfcovington and @Alex131089)
 

bootstrap3/renderers.py

@@ -370,11 +370,9 @@ def post_widget_render(self, html):
 
     def wrap_widget(self, html):
         if isinstance(self.widget, CheckboxInput):
-            checkbox_class = add_css_class('checkbox', self.get_size_class())
-            html = '<div class="{klass}">{content}</div>'.format(
-                klass=checkbox_class,
-                content=html,
-            )
+            # Wrap checkboxes
+            # Note checkboxes do not get size classes, see #318
+            html = '<div class="checkbox">{content}</div>'.format(content=html)
         return html
 
     def make_input_group(self, html):
@@ -450,20 +448,19 @@ def add_label(self, html):
 
     def get_form_group_class(self):
         form_group_class = self.form_group_class
-        if self.field.errors and self.error_css_class:
-            form_group_class = add_css_class(
-                form_group_class, self.error_css_class)
+        if self.field.errors:
+            if self.error_css_class:
+                form_group_class = add_css_class(form_group_class, self.error_css_class)
+        else:
+            if self.field.form.is_bound:
+                form_group_class = add_css_class(form_group_class, self.success_css_class)
         if self.field.field.required and self.required_css_class:
-            form_group_class = add_css_class(
-                form_group_class, self.required_css_class)
-        if self.field_errors:
-            form_group_class = add_css_class(form_group_class, 'has-error')
-        elif self.field.form.is_bound:
-            form_group_class = add_css_class(
-                form_group_class, self.success_css_class)
+            form_group_class = add_css_class(form_group_class, self.required_css_class)
         if self.layout == 'horizontal':
             form_group_class = add_css_class(
-                form_group_class, self.get_size_class(prefix='form-group'))
+                form_group_class,
+                self.get_size_class(prefix='form-group')
+            )
         return form_group_class
 
     def wrap_label_and_field(self, html):