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 'feature' of https://github.com/netbox-community/netbox into feature

Browse Source 
# Conflicts:
#	netbox/project-static/js/forms.js
#	netbox/templates/dcim/location.html
#	netbox/templates/generic/object_list.html
This commit is contained in:
checktheroads
2021-04-22 19:19:03 -07:00
parent 16b57193f1 9476fda987
commit eb55761c38
24 changed files with 237 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/ipam/tables.py
View File

@ -340,10 +340,10 @@ class IPAddressTable(BaseTable):
verbose_name='Interface'
)
assigned_object_parent = tables.Column(
accessor='assigned_object__parent',
accessor='assigned_object.parent_object',
linkify=True,
orderable=False,
verbose_name='Interface Parent'
verbose_name='Device/VM'
)
class Meta(BaseTable.Meta):