Remove support for set_required and set_disabled (fixes zostera#337, #fixes zostera#345)

Author: dyve

HISTORY.rst

@@ -6,6 +6,9 @@ History
 Develop
 +++++++
 
+* Remove everything to do with setting HTML `required` attribute (#337)
+* Remove everything to do with setting HTML `disabled` attribute (#345)
+* Fix warnings during install (thanks @mfcovington)
 * Add subresource integrity to external components (thanks @mfcovington and @Alex131089)
 
 

bootstrap3/bootstrap.py

@@ -16,8 +16,6 @@
     'include_jquery': False,
     'horizontal_label_class': 'col-md-3',
     'horizontal_field_class': 'col-md-9',
-    'set_required': True,
-    'set_disabled': False,
     'set_placeholder': True,
     'required_css_class': '',
     'error_css_class': 'has-error',

bootstrap3/forms.py

@@ -164,8 +164,6 @@ def is_widget_required_attribute(widget):
     """
     Is this widget required?
     """
-    if not get_bootstrap_setting('set_required'):
-        return False
     if not widget.is_required:
         return False
     if isinstance(

bootstrap3/renderers.py

@@ -36,8 +36,6 @@ def __init__(self, *args, **kwargs):
         self.show_help = kwargs.get('show_help', True)
         self.show_label = kwargs.get('show_label', True)
         self.exclude = kwargs.get('exclude', '')
-        self.set_required = kwargs.get('set_required', True)
-        self.set_disabled = kwargs.get('set_disabled', False)
         self.size = self.parse_size(kwargs.get('size', ''))
         self.horizontal_label_class = kwargs.get(
             'horizontal_label_class',
@@ -102,8 +100,6 @@ def render_forms(self):
                 show_label=self.show_label,
                 show_help=self.show_help,
                 exclude=self.exclude,
-                set_required=self.set_required,
-                set_disabled=self.set_disabled,
                 size=self.size,
                 horizontal_label_class=self.horizontal_label_class,
                 horizontal_field_class=self.horizontal_field_class,
@@ -147,9 +143,6 @@ def __init__(self, form, *args, **kwargs):
                 'Parameter "form" should contain a valid Django Form.')
         self.form = form
         super(FormRenderer, self).__init__(*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)
@@ -166,8 +159,6 @@ def render_fields(self):
                 show_label=self.show_label,
                 show_help=self.show_help,
                 exclude=self.exclude,
-                set_required=self.set_required,
-                set_disabled=self.set_disabled,
                 size=self.size,
                 horizontal_label_class=self.horizontal_label_class,
                 horizontal_field_class=self.horizontal_field_class,
@@ -269,11 +260,8 @@ def __init__(self, field, *args, **kwargs):
 
         # Handle form.empty_permitted
         if self.field.form.empty_permitted:
-            self.set_required = False
             self.required_css_class = ''
 
-        self.set_disabled = kwargs.get('set_disabled', False)
-
     def restore_widget_attrs(self):
         self.widget.attrs = self.initial_attrs.copy()
 
@@ -307,18 +295,6 @@ def add_help_attrs(self, widget=None):
                 escape(strip_tags(self.field_help))
             )
 
-    def add_required_attrs(self, widget=None):
-        if widget is None:
-            widget = self.widget
-        if self.set_required and is_widget_required_attribute(widget):
-            widget.attrs['required'] = 'required'
-
-    def add_disabled_attrs(self, widget=None):
-        if widget is None:
-            widget = self.widget
-        if self.set_disabled:
-            widget.attrs['disabled'] = 'disabled'
-
     def add_widget_attrs(self):
         if self.is_multi_widget:
             widgets = self.widget.widgets
@@ -328,8 +304,6 @@ def add_widget_attrs(self):
             self.add_class_attrs(widget)
             self.add_placeholder_attrs(widget)
             self.add_help_attrs(widget)
-            self.add_required_attrs(widget)
-            self.add_disabled_attrs(widget)
 
     def list_to_class(self, html, klass):
         classes = add_css_class(klass, self.get_size_class())

bootstrap3/templatetags/bootstrap3.py

@@ -406,17 +406,6 @@ def bootstrap_field(*args, **kwargs):
         exclude
             A list of field names that should not be rendered
 
-        set_required
-            When set to ``True`` and the field is required then the ``required`` attribute is set on the
-            rendered field
-
-            :default: ``True``
-
-        set_disabled
-            When set to ``True`` then the ``disabled`` attribute is set on the rendered field.
-
-            :default: ``False``
-
         size
             Controls the size of the rendered ``div.form-group`` through the use of CSS classes.
 

bootstrap3/tests.py

@@ -397,28 +397,31 @@ def test_password(self):
         self.assertIn('placeholder="Password"', res)
 
     def test_required_field(self):
+        """
+        Does a required field get the CSS class for required?
+        """
+        required_css_class='bootstrap3-req'
         required_field = render_form_field('subject')
-        self.assertIn('required', required_field)
-        self.assertIn('bootstrap3-req', required_field)
+        self.assertIn(required_css_class, required_field)
         not_required_field = render_form_field('message')
-        self.assertNotIn('required', not_required_field)
-        # Required field with required=0
-        form_field = 'form.subject'
-        rendered = render_template_with_form('{% bootstrap_field ' + form_field + ' set_required=0 %}')
-        self.assertNotIn('required', rendered)
+        self.assertNotIn(required_css_class, not_required_field)
         # Required settings in field
         form_field = 'form.subject'
         rendered = render_template_with_form(
             '{% bootstrap_field ' + form_field + ' required_css_class="test-required" %}')
         self.assertIn('test-required', rendered)
 
     def test_empty_permitted(self):
+        """
+        If a form has empty_permitted, no fields should get the CSS class for required
+        """
+        required_css_class='bootstrap3-req'
         form = TestForm()
         res = render_form_field('subject', {'form': form})
-        self.assertIn('required', res)
+        self.assertIn(required_css_class, res)
         form.empty_permitted = True
         res = render_form_field('subject', {'form': form})
-        self.assertNotIn('required', res)
+        self.assertNotIn(required_css_class, res)
 
     def test_input_group(self):
         res = render_template_with_form('{% bootstrap_field form.subject addon_before="$"  addon_after=".00" %}')

demo/demo/settings.py

@@ -157,7 +157,6 @@
 
 # Settings for django-bootstrap3
 BOOTSTRAP3 = {
-    'set_required': False,
     'error_css_class': 'bootstrap3-error',
     'required_css_class': 'bootstrap3-required',
     'javascript_in_head': True,

docs/settings.rst

@@ -41,12 +41,6 @@ The ``BOOTSTRAP3`` dict variable contains these settings and defaults:
         # Field class to use in horizontal forms
         'horizontal_field_class': 'col-md-9',
 
-        # Set HTML required attribute on required fields
-        'set_required': True,
-
-        # Set HTML disabled attribute on disabled fields
-        'set_disabled': False,
-
         # Set placeholder attributes to label if no placeholder is provided
         'set_placeholder': True,