1
0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00

Merge branch 'develop' into v2-develop

This commit is contained in:
Jeremy Stretch
2017-05-08 15:02:06 -04:00
committed by GitHub
34 changed files with 888 additions and 861 deletions

View File

@ -125,6 +125,19 @@ class ColorSelect(forms.Select):
super(ColorSelect, self).__init__(*args, **kwargs)
class BulkEditNullBooleanSelect(forms.NullBooleanSelect):
def __init__(self, *args, **kwargs):
super(BulkEditNullBooleanSelect, self).__init__(*args, **kwargs)
# Override the built-in choice labels
self.choices = (
('1', '---------'),
('2', 'Yes'),
('3', 'No'),
)
class SelectWithDisabled(forms.Select):
"""
Modified the stock Select widget to accept choices using a dict() for a label. The dict for each option must include