NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-24 17:38:37 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Fixes #1334: Fix server error when adding an interface to a device

Browse Source
This commit is contained in:
Jeremy Stretch 2017-07-11 14:52:50 -04:00
parent 2d0638821d
commit 74828e1409
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/circuits/forms.py
View File

@ -244,7 +244,7 @@ class CircuitTerminationForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm
# Initialize helper selectors # Initialize helper selectors
instance = kwargs.get('instance') instance = kwargs.get('instance')
if instance and instance.interface is not None: if instance and instance.interface is not None:
initial = kwargs.get('initial', {}) initial = kwargs.get('initial', {}).copy()
initial['rack'] = instance.interface.device.rack initial['rack'] = instance.interface.device.rack
initial['device'] = instance.interface.device initial['device'] = instance.interface.device
kwargs['initial'] = initial kwargs['initial'] = initial

4
netbox/dcim/forms.py
View File

@ -630,7 +630,7 @@ class DeviceForm(BootstrapMixin, TenancyForm, CustomFieldForm):
instance = kwargs.get('instance') instance = kwargs.get('instance')
# Using hasattr() instead of "is not None" to avoid RelatedObjectDoesNotExist on required field # Using hasattr() instead of "is not None" to avoid RelatedObjectDoesNotExist on required field
if instance and hasattr(instance, 'device_type'): if instance and hasattr(instance, 'device_type'):
initial = kwargs.get('initial', {}) initial = kwargs.get('initial', {}).copy()
initial['manufacturer'] = instance.device_type.manufacturer initial['manufacturer'] = instance.device_type.manufacturer
kwargs['initial'] = initial kwargs['initial'] = initial
@ -1479,7 +1479,7 @@ class InterfaceCreateForm(DeviceComponentForm):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
# Set interfaces enabled by default # Set interfaces enabled by default
kwargs['initial'] = kwargs.get('initial', {}) kwargs['initial'] = kwargs.get('initial', {}).copy()
kwargs['initial'].update({'enabled': True}) kwargs['initial'].update({'enabled': True})
super(InterfaceCreateForm, self).__init__(*args, **kwargs) super(InterfaceCreateForm, self).__init__(*args, **kwargs)

4
netbox/ipam/forms.py
View File

@ -217,7 +217,7 @@ class PrefixForm(BootstrapMixin, TenancyForm, CustomFieldForm):
# Initialize helper selectors # Initialize helper selectors
instance = kwargs.get('instance') instance = kwargs.get('instance')
initial = kwargs.get('initial', {}) initial = kwargs.get('initial', {}).copy()
if instance and instance.vlan is not None: if instance and instance.vlan is not None:
initial['vlan_group'] = instance.vlan.group initial['vlan_group'] = instance.vlan.group
kwargs['initial'] = initial kwargs['initial'] = initial
@ -492,7 +492,7 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldForm)
# Initialize helper selectors # Initialize helper selectors
instance = kwargs.get('instance') instance = kwargs.get('instance')
initial = kwargs.get('initial', {}) initial = kwargs.get('initial', {}).copy()
if instance and instance.interface is not None: if instance and instance.interface is not None:
initial['interface_site'] = instance.interface.device.site initial['interface_site'] = instance.interface.device.site
initial['interface_rack'] = instance.interface.device.rack initial['interface_rack'] = instance.interface.device.rack

2
netbox/tenancy/forms.py
View File

@ -102,7 +102,7 @@ class TenancyForm(ChainedFieldsMixin, forms.Form):
# Initialize helper selector # Initialize helper selector
instance = kwargs.get('instance') instance = kwargs.get('instance')
if instance and instance.tenant is not None: if instance and instance.tenant is not None:
initial = kwargs.get('initial', {}) initial = kwargs.get('initial', {}).copy()
initial['tenant_group'] = instance.tenant.group initial['tenant_group'] = instance.tenant.group
kwargs['initial'] = initial kwargs['initial'] = initial