NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-09 00:58:16 -06:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Merge a797dee93e into ac36339491

Browse Source
This commit is contained in:
Arsen Akishev 2018-08-22 15:36:53 +00:00 committed by GitHub
commit debe72e9a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/circuits/forms.py
View File

@ -41,7 +41,7 @@ class ProviderForm(BootstrapMixin, CustomFieldForm):
} }
class ProviderCSVForm(forms.ModelForm): class ProviderCSVForm(CustomFieldForm):
slug = SlugField() slug = SlugField()
class Meta: class Meta:
@ -119,7 +119,7 @@ class CircuitForm(BootstrapMixin, TenancyForm, CustomFieldForm):
} }
class CircuitCSVForm(forms.ModelForm): class CircuitCSVForm(CustomFieldForm):
provider = forms.ModelChoiceField( provider = forms.ModelChoiceField(
queryset=Provider.objects.all(), queryset=Provider.objects.all(),
to_field_name='name', to_field_name='name',

8
netbox/dcim/forms.py
View File

@ -135,7 +135,7 @@ class SiteForm(BootstrapMixin, TenancyForm, CustomFieldForm):
} }
class SiteCSVForm(forms.ModelForm): class SiteCSVForm(CustomFieldForm):
status = CSVChoiceField( status = CSVChoiceField(
choices=SITE_STATUS_CHOICES, choices=SITE_STATUS_CHOICES,
required=False, required=False,
@ -322,7 +322,7 @@ class RackForm(BootstrapMixin, TenancyForm, CustomFieldForm):
} }
class RackCSVForm(forms.ModelForm): class RackCSVForm(CustomFieldForm):
site = forms.ModelChoiceField( site = forms.ModelChoiceField(
queryset=Site.objects.all(), queryset=Site.objects.all(),
to_field_name='name', to_field_name='name',
@ -542,7 +542,7 @@ class DeviceTypeForm(BootstrapMixin, CustomFieldForm):
} }
class DeviceTypeCSVForm(forms.ModelForm): class DeviceTypeCSVForm(CustomFieldForm):
manufacturer = forms.ModelChoiceField( manufacturer = forms.ModelChoiceField(
queryset=Manufacturer.objects.all(), queryset=Manufacturer.objects.all(),
required=True, required=True,
@ -920,7 +920,7 @@ class DeviceForm(BootstrapMixin, TenancyForm, CustomFieldForm):
self.initial['rack'] = self.instance.parent_bay.device.rack_id self.initial['rack'] = self.instance.parent_bay.device.rack_id
class BaseDeviceCSVForm(forms.ModelForm): class BaseDeviceCSVForm(CustomFieldForm):
device_role = forms.ModelChoiceField( device_role = forms.ModelChoiceField(
queryset=DeviceRole.objects.all(), queryset=DeviceRole.objects.all(),
to_field_name='name', to_field_name='name',

10
netbox/ipam/forms.py
View File

@ -49,7 +49,7 @@ class VRFForm(BootstrapMixin, TenancyForm, CustomFieldForm):
} }
class VRFCSVForm(forms.ModelForm): class VRFCSVForm(CustomFieldForm):
tenant = forms.ModelChoiceField( tenant = forms.ModelChoiceField(
queryset=Tenant.objects.all(), queryset=Tenant.objects.all(),
required=False, required=False,
@ -138,7 +138,7 @@ class AggregateForm(BootstrapMixin, CustomFieldForm):
} }
class AggregateCSVForm(forms.ModelForm): class AggregateCSVForm(CustomFieldForm):
rir = forms.ModelChoiceField( rir = forms.ModelChoiceField(
queryset=RIR.objects.all(), queryset=RIR.objects.all(),
to_field_name='name', to_field_name='name',
@ -257,7 +257,7 @@ class PrefixForm(BootstrapMixin, TenancyForm, CustomFieldForm):
self.fields['vrf'].empty_label = 'Global' self.fields['vrf'].empty_label = 'Global'
class PrefixCSVForm(forms.ModelForm): class PrefixCSVForm(CustomFieldForm):
vrf = forms.ModelChoiceField( vrf = forms.ModelChoiceField(
queryset=VRF.objects.all(), queryset=VRF.objects.all(),
required=False, required=False,
@ -554,7 +554,7 @@ class IPAddressBulkAddForm(BootstrapMixin, TenancyForm, CustomFieldForm):
self.fields['vrf'].empty_label = 'Global' self.fields['vrf'].empty_label = 'Global'
class IPAddressCSVForm(forms.ModelForm): class IPAddressCSVForm(CustomFieldForm):
vrf = forms.ModelChoiceField( vrf = forms.ModelChoiceField(
queryset=VRF.objects.all(), queryset=VRF.objects.all(),
required=False, required=False,
@ -806,7 +806,7 @@ class VLANForm(BootstrapMixin, TenancyForm, CustomFieldForm):
} }
class VLANCSVForm(forms.ModelForm): class VLANCSVForm(CustomFieldForm):
site = forms.ModelChoiceField( site = forms.ModelChoiceField(
queryset=Site.objects.all(), queryset=Site.objects.all(),
required=False, required=False,

2
netbox/tenancy/forms.py
View File

@ -48,7 +48,7 @@ class TenantForm(BootstrapMixin, CustomFieldForm):
fields = ['name', 'slug', 'group', 'description', 'comments', 'tags'] fields = ['name', 'slug', 'group', 'description', 'comments', 'tags']
class TenantCSVForm(forms.ModelForm): class TenantCSVForm(CustomFieldForm):
slug = SlugField() slug = SlugField()
group = forms.ModelChoiceField( group = forms.ModelChoiceField(
queryset=TenantGroup.objects.all(), queryset=TenantGroup.objects.all(),

4
netbox/virtualization/forms.py
View File

@ -86,7 +86,7 @@ class ClusterForm(BootstrapMixin, CustomFieldForm):
fields = ['name', 'type', 'group', 'site', 'comments', 'tags'] fields = ['name', 'type', 'group', 'site', 'comments', 'tags']
class ClusterCSVForm(forms.ModelForm): class ClusterCSVForm(CustomFieldForm):
type = forms.ModelChoiceField( type = forms.ModelChoiceField(
queryset=ClusterType.objects.all(), queryset=ClusterType.objects.all(),
to_field_name='name', to_field_name='name',
@ -302,7 +302,7 @@ class VirtualMachineForm(BootstrapMixin, TenancyForm, CustomFieldForm):
self.fields['primary_ip6'].widget.attrs['readonly'] = True self.fields['primary_ip6'].widget.attrs['readonly'] = True
class VirtualMachineCSVForm(forms.ModelForm): class VirtualMachineCSVForm(CustomFieldForm):
status = CSVChoiceField( status = CSVChoiceField(
choices=VM_STATUS_CHOICES, choices=VM_STATUS_CHOICES,
required=False, required=False,