Merge pull request zostera#406 from mkoistinen/feature/errors_type_support

Satisfies zostera#380: Adds ‘errors_types’ support in bootstrap_form tag

Author: dyve

AUTHORS.rst

@@ -22,6 +22,7 @@ Contributors
 * Jordan Starcher <[email protected]>
 * Juan Carlos <[email protected]>
 * Markus Holtermann <[email protected]>
+* Martin Koistinen <[email protected]>
 * Nick S <[email protected]>
 * Owais Lone <[email protected]>
 * pmav99 <[email protected]>

HISTORY.rst

@@ -8,6 +8,7 @@ Development (in progress)
 +++++++++++++++++++++++++
 
 * Renamed requirements-dev.txt back to requirements.txt because that suits ReadTheDocs better
+* Added 'errors_type' support on bootstrap3_form (thanks @mkoistinen)
 
 
 8.2.3 (2017-05-05)

bootstrap3/renderers.py

@@ -166,6 +166,7 @@ def __init__(self, form, *args, **kwargs):
         if DBS3_SET_REQUIRED_SET_DISABLED and self.form.empty_permitted:
             self.set_required = False
 
+        self.errors_type = kwargs.get('errors_type', 'all')
         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)
@@ -202,7 +203,7 @@ def get_fields_errors(self):
         return form_errors
 
     def render_errors(self, type='all'):
-        form_errors = None
+        form_errors = []
         if type == 'all':
             form_errors = self.get_fields_errors() + self.form.non_field_errors()
         elif type == 'fields':
@@ -224,7 +225,7 @@ def render_errors(self, type='all'):
         return ''
 
     def _render(self):
-        return self.render_errors() + self.render_fields()
+        return self.render_errors(self.errors_type) + self.render_fields()
 
 
 class FieldRenderer(BaseRenderer):

bootstrap3/templatetags/bootstrap3.py

@@ -318,6 +318,13 @@ def bootstrap_form(*args, **kwargs):
             A list of field names (comma separated) that should not be rendered
             E.g. exclude=subject,bcc
 
+        errors_type
+            This controls the types of errors that are rendered above the form.
+            Choices are: "all", "fields", "non_fields" or "none". This will not
+            affect the display of errors on the fields themselves.
+
+            Default is "all".
+
         See bootstrap_field_ for other arguments
 
     **Usage**::