starred/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-03-29 22:02:11 +02:00
Code Issues 273 Packages Projects Releases 10 Wiki Activity

Merge branch 'develop' into develop-2.6

Browse Source
This commit is contained in:
Jeremy Stretch
2019-02-22 12:10:44 -05:00
parent 00c4d3dd92 77c387a559
commit 6a8c935380
17 changed files with 78 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
netbox/dcim/forms.py
View File

@@ -2410,7 +2410,7 @@ class FrontPortCreateForm(ComponentForm):
class FrontPortBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm):
pk = forms.ModelMultipleChoiceField(
queryset=Interface.objects.all(),
queryset=FrontPort.objects.all(),
widget=forms.MultipleHiddenInput()
)
type = forms.ChoiceField(
@@ -2484,7 +2484,7 @@ class RearPortCreateForm(ComponentForm):
class RearPortBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm):
pk = forms.ModelMultipleChoiceField(
queryset=Interface.objects.all(),
queryset=RearPort.objects.all(),
widget=forms.MultipleHiddenInput()
)
type = forms.ChoiceField(
@@ -2801,10 +2801,15 @@ class CableFilterForm(BootstrapMixin, forms.Form):
label='Search'
)
type = forms.MultipleChoiceField(
choices=CABLE_TYPE_CHOICES,
choices=add_blank_choice(CABLE_TYPE_CHOICES),
required=False,
widget=StaticSelect2()
)
status = forms.ChoiceField(
required=False,
choices=add_blank_choice(CONNECTION_STATUS_CHOICES),
widget=StaticSelect2()
)
color = forms.CharField(
max_length=6,
required=False,