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

Fixes #1927: Include all VC member interaces on A side when creating a new interface connection

Browse Source
This commit is contained in:
Jeremy Stretch
2018-03-01 09:49:17 -05:00
parent 9e11591b3b
commit 01a97add2a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
netbox/dcim/forms.py
View File

@ -2069,7 +2069,7 @@ class InterfaceConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelFor
super(InterfaceConnectionForm, self).__init__(*args, **kwargs) super(InterfaceConnectionForm, self).__init__(*args, **kwargs)
# Initialize interface A choices # Initialize interface A choices
device_a_interfaces = Interface.objects.connectable().order_naturally().filter(device=device_a).select_related( device_a_interfaces = device_a.vc_interfaces.connectable().order_naturally().select_related(
'circuit_termination', 'connected_as_a', 'connected_as_b' 'circuit_termination', 'connected_as_a', 'connected_as_b'
) )
self.fields['interface_a'].choices = [ self.fields['interface_a'].choices = [
@ -2078,9 +2078,11 @@ class InterfaceConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelFor
# Mark connected interfaces as disabled # Mark connected interfaces as disabled
if self.data.get('device_b'): if self.data.get('device_b'):
self.fields['interface_b'].choices = [ self.fields['interface_b'].choices = []
(iface.id, {'label': iface.name, 'disabled': iface.is_connected}) for iface in self.fields['interface_b'].queryset for iface in self.fields['interface_b'].queryset:
] self.fields['interface_b'].choices.append(
(iface.id, {'label': iface.name, 'disabled': iface.is_connected})
)
class InterfaceConnectionCSVForm(forms.ModelForm): class InterfaceConnectionCSVForm(forms.ModelForm):