estel/netbox
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'develop' into 568-csv-import-cf

Browse Source
This commit is contained in:
Saria Hajjar
2020-01-16 16:05:01 +00:00
parent d075bf5882 3eb2d45e8d
commit 89e6de3652
1030 changed files with 94333 additions and 6657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
netbox/ipam/forms.py
View File

@@ -13,7 +13,7 @@ from utilities.forms import (
SlugField, StaticSelect2, StaticSelect2Multiple, BOOLEAN_WITH_BLANK_CHOICES
)
from virtualization.models import VirtualMachine
from .constants import *
from .choices import *
from .models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF
IP_FAMILY_CHOICES = [
@@ -243,7 +243,7 @@ class RoleForm(BootstrapMixin, forms.ModelForm):
class Meta:
model = Role
fields = [
'name', 'slug', 'weight',
'name', 'slug', 'weight', 'description',
]
@@ -377,7 +377,7 @@ class PrefixCSVForm(CustomFieldForm):
required=False
)
status = CSVChoiceField(
choices=PREFIX_STATUS_CHOICES,
choices=PrefixStatusChoices,
help_text='Operational status'
)
role = forms.ModelChoiceField(
@@ -462,7 +462,7 @@ class PrefixBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditF
)
)
status = forms.ChoiceField(
choices=add_blank_choice(PREFIX_STATUS_CHOICES),
choices=add_blank_choice(PrefixStatusChoices),
required=False,
widget=StaticSelect2()
)
@@ -530,7 +530,7 @@ class PrefixFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm)
)
)
status = forms.MultipleChoiceField(
choices=PREFIX_STATUS_CHOICES,
choices=PrefixStatusChoices,
required=False,
widget=StaticSelect2Multiple()
)
@@ -779,11 +779,11 @@ class IPAddressCSVForm(CustomFieldForm):
}
)
status = CSVChoiceField(
choices=IPADDRESS_STATUS_CHOICES,
choices=IPAddressStatusChoices,
help_text='Operational status'
)
role = CSVChoiceField(
choices=IPADDRESS_ROLE_CHOICES,
choices=IPAddressRoleChoices,
required=False,
help_text='Functional role'
)
@@ -908,12 +908,12 @@ class IPAddressBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEd
)
)
status = forms.ChoiceField(
choices=add_blank_choice(IPADDRESS_STATUS_CHOICES),
choices=add_blank_choice(IPAddressStatusChoices),
required=False,
widget=StaticSelect2()
)
role = forms.ChoiceField(
choices=add_blank_choice(IPADDRESS_ROLE_CHOICES),
choices=add_blank_choice(IPAddressRoleChoices),
required=False,
widget=StaticSelect2()
)
@@ -989,12 +989,12 @@ class IPAddressFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterFo
)
)
status = forms.MultipleChoiceField(
choices=IPADDRESS_STATUS_CHOICES,
choices=IPAddressStatusChoices,
required=False,
widget=StaticSelect2Multiple()
)
role = forms.MultipleChoiceField(
choices=IPADDRESS_ROLE_CHOICES,
choices=IPAddressRoleChoices,
required=False,
widget=StaticSelect2Multiple()
)
@@ -1147,7 +1147,7 @@ class VLANCSVForm(CustomFieldForm):
}
)
status = CSVChoiceField(
choices=VLAN_STATUS_CHOICES,
choices=VLANStatusChoices,
help_text='Operational status'
)
role = forms.ModelChoiceField(
@@ -1216,7 +1216,7 @@ class VLANBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditFor
)
)
status = forms.ChoiceField(
choices=add_blank_choice(VLAN_STATUS_CHOICES),
choices=add_blank_choice(VLANStatusChoices),
required=False,
widget=StaticSelect2()
)
@@ -1278,7 +1278,7 @@ class VLANFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm):
)
)
status = forms.MultipleChoiceField(
choices=VLAN_STATUS_CHOICES,
choices=VLANStatusChoices,
required=False,
widget=StaticSelect2Multiple()
)
@@ -1345,7 +1345,7 @@ class ServiceFilterForm(BootstrapMixin, CustomFieldFilterForm):
label='Search'
)
protocol = forms.ChoiceField(
choices=add_blank_choice(IP_PROTOCOL_CHOICES),
choices=add_blank_choice(ServiceProtocolChoices),
required=False,
widget=StaticSelect2Multiple()
)
@@ -1360,7 +1360,7 @@ class ServiceBulkEditForm(BootstrapMixin, CustomFieldBulkEditForm):
widget=forms.MultipleHiddenInput()
)
protocol = forms.ChoiceField(
choices=add_blank_choice(IP_PROTOCOL_CHOICES),
choices=add_blank_choice(ServiceProtocolChoices),
required=False,
widget=StaticSelect2()
)