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

Merge branch 'develop-2.3' into develop

Browse Source
This commit is contained in:
Jeremy Stretch
2018-02-26 14:14:47 -05:00
parent 5ed797cfc9 8ad59058a5
commit 22f17a1424
90 changed files with 4624 additions and 1132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
netbox/ipam/forms.py
View File

@@ -931,8 +931,9 @@ class ServiceForm(BootstrapMixin, forms.ModelForm):
# Limit IP address choices to those assigned to interfaces of the parent device/VM
if self.instance.device:
vc_interface_ids = [i['id'] for i in self.instance.device.vc_interfaces.values('id')]
self.fields['ipaddresses'].queryset = IPAddress.objects.filter(
interface__device=self.instance.device
interface_id__in=vc_interface_ids
)
elif self.instance.virtual_machine:
self.fields['ipaddresses'].queryset = IPAddress.objects.filter(