From e06bfffd60eabe50b0f80f5c1c07c1edb73c46ce Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 29 Dec 2016 11:53:24 -0500 Subject: [PATCH] Fixed outdated select_related reference to circuit --- netbox/dcim/forms.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 001338427..d82f28090 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -1120,8 +1120,8 @@ class InterfaceConnectionForm(BootstrapMixin, forms.ModelForm): super(InterfaceConnectionForm, self).__init__(*args, **kwargs) # Initialize interface A choices - device_a_interfaces = Interface.objects.filter(device=device_a).exclude(form_factor=IFACE_FF_VIRTUAL) \ - .select_related('circuit', 'connected_as_a', 'connected_as_b') + device_a_interfaces = Interface.objects.filter(device=device_a).exclude(form_factor=IFACE_FF_VIRTUAL)\ + .select_related('circuit_termination', 'connected_as_a', 'connected_as_b') self.fields['interface_a'].choices = [ (iface.id, {'label': iface.name, 'disabled': iface.is_connected}) for iface in device_a_interfaces ] @@ -1144,11 +1144,13 @@ class InterfaceConnectionForm(BootstrapMixin, forms.ModelForm): # Initialize interface_b choices if device_b is set if self.is_bound: - device_b_interfaces = Interface.objects.filter(device=self.data['device_b']) \ - .exclude(form_factor=IFACE_FF_VIRTUAL).select_related('circuit', 'connected_as_a', 'connected_as_b') + device_b_interfaces = Interface.objects.filter(device=self.data['device_b'])\ + .exclude(form_factor=IFACE_FF_VIRTUAL)\ + .select_related('circuit_termination', 'connected_as_a', 'connected_as_b') elif self.initial.get('device_b'): - device_b_interfaces = Interface.objects.filter(device=self.initial['device_b']) \ - .exclude(form_factor=IFACE_FF_VIRTUAL).select_related('circuit', 'connected_as_a', 'connected_as_b') + device_b_interfaces = Interface.objects.filter(device=self.initial['device_b'])\ + .exclude(form_factor=IFACE_FF_VIRTUAL)\ + .select_related('circuit_termination', 'connected_as_a', 'connected_as_b') else: device_b_interfaces = [] self.fields['interface_b'].choices = [