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

Closes #862: Show both IPv6 and IPv4 primary IPs in device list

Browse Source
This commit is contained in:
Jeremy Stretch
2017-02-28 16:46:44 -05:00
parent 9313ba08ed
commit 5ad3044314
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
netbox/dcim/tables.py
View File

@ -94,6 +94,12 @@ STATUS_ICON = """
{% endif %} {% endif %}
""" """
DEVICE_PRIMARY_IP = """
{{ record.primary_ip6.address.ip|default:"" }}
{% if record.primary_ip6 and record.primary_ip4 %}<br />{% endif %}
{{ record.primary_ip4.address.ip|default:"" }}
"""
UTILIZATION_GRAPH = """ UTILIZATION_GRAPH = """
{% load helpers %} {% load helpers %}
{% utilization_graph value %} {% utilization_graph value %}
@ -106,7 +112,6 @@ UTILIZATION_GRAPH = """
class RegionTable(BaseTable): class RegionTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
# name = tables.LinkColumn(verbose_name='Name')
name = tables.TemplateColumn(template_code=REGION_LINK, orderable=False) name = tables.TemplateColumn(template_code=REGION_LINK, orderable=False)
site_count = tables.Column(verbose_name='Sites') site_count = tables.Column(verbose_name='Sites')
slug = tables.Column(verbose_name='Slug') slug = tables.Column(verbose_name='Slug')
@ -365,7 +370,7 @@ class DeviceTable(BaseTable):
device_type = tables.LinkColumn('dcim:devicetype', args=[Accessor('device_type.pk')], verbose_name='Type', device_type = tables.LinkColumn('dcim:devicetype', args=[Accessor('device_type.pk')], verbose_name='Type',
text=lambda record: record.device_type.full_name) text=lambda record: record.device_type.full_name)
primary_ip = tables.TemplateColumn(orderable=False, verbose_name='IP Address', primary_ip = tables.TemplateColumn(orderable=False, verbose_name='IP Address',
template_code="{{ record.primary_ip.address.ip }}") template_code=DEVICE_PRIMARY_IP)
class Meta(BaseTable.Meta): class Meta(BaseTable.Meta):
model = Device model = Device