Merge branch 'feature' into 6732-asn-model

2021-11-03 08:37:11 -05:00
parent 7625a2dd3c 18080a969e
commit db2d71ed9e
40 changed files with 1137 additions and 19 deletions
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -1747,7 +1747,7 @@ class InterfaceView(generic.ObjectView):

    def get_extra_context(self, request, instance):
        # Get assigned IP addresses
-        ipaddress_table = InterfaceIPAddressTable(
+        ipaddress_table = AssignedIPAddressesTable(
            data=instance.ip_addresses.restrict(request.user, 'view').prefetch_related('vrf', 'tenant'),
            orderable=False
        )