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

Fix #5819 and #5872 - Fix Primary IP Sorting Issues for Devices and VMs

Browse Source
This commit is contained in:
Luke Anderson
2021-02-15 21:01:55 +10:30
parent 3d3748d6f5
commit d2c8aae59c
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
netbox/virtualization/tables.py
View File

@ -1,5 +1,5 @@
import django_tables2 as tables
from django.conf import settings
from dcim.tables.devices import BaseInterfaceTable
from tenancy.tables import COL_TENANT
from utilities.tables import (
@ -125,10 +125,18 @@ class VirtualMachineDetailTable(VirtualMachineTable):
linkify=True,
verbose_name='IPv6 Address'
)
primary_ip = tables.Column(
linkify=True,
verbose_name='IP Address'
)
if settings.PREFER_IPV4:
primary_ip = tables.Column(
linkify=True,
order_by=('primary_ip4', 'primary_ip6'),
verbose_name='IP Address'
)
else:
primary_ip = tables.Column(
linkify=True,
order_by=('primary_ip6', 'primary_ip4'),
verbose_name='IP Address'
)
tags = TagColumn(
url_name='virtualization:virtualmachine_list'
)