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

Merge branch 'develop' of https://github.com/digitalocean/netbox into 2813-addtenantgroupfilter

Browse Source
This commit is contained in:
dansheps
2019-04-09 15:57:22 -05:00
parent 37811d3f7e 8d79353d9b
commit a91a79681f
130 changed files with 585 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
netbox/dcim/forms.py
View File

@ -1678,7 +1678,6 @@ class DeviceFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm)
widget=APISelectMultiple(
api_url="/api/dcim/device-roles/",
value_field="slug",
null_option=True,
)
)
manufacturer_id = FilterChoiceField(
@ -2675,12 +2674,12 @@ class CableBulkEditForm(BootstrapMixin, BulkEditForm):
status = forms.ChoiceField(
choices=add_blank_choice(CONNECTION_STATUS_CHOICES),
required=False,
widget=StaticSelect2(),
initial=''
)
label = forms.CharField(
max_length=100,
required=False,
widget=StaticSelect2()
required=False
)
color = forms.CharField(
max_length=6,