1
0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00

Closes #7284: Include comments field in table/export for all appropriate models

This commit is contained in:
jeremystretch
2021-09-17 12:04:22 -04:00
parent e67c965180
commit 16d8981a3f
11 changed files with 60 additions and 22 deletions

View File

@@ -3,7 +3,8 @@ from django.conf import settings
from dcim.tables.devices import BaseInterfaceTable
from tenancy.tables import TenantColumn
from utilities.tables import (
BaseTable, ButtonsColumn, ChoiceFieldColumn, ColoredLabelColumn, LinkedCountColumn, TagColumn, ToggleColumn,
BaseTable, ButtonsColumn, ChoiceFieldColumn, ColoredLabelColumn, LinkedCountColumn, MarkdownColumn, TagColumn,
ToggleColumn,
)
from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterface
@@ -91,13 +92,14 @@ class ClusterTable(BaseTable):
url_params={'cluster_id': 'pk'},
verbose_name='VMs'
)
comments = MarkdownColumn()
tags = TagColumn(
url_name='virtualization:cluster_list'
)
class Meta(BaseTable.Meta):
model = Cluster
fields = ('pk', 'name', 'type', 'group', 'tenant', 'site', 'device_count', 'vm_count', 'tags')
fields = ('pk', 'name', 'type', 'group', 'tenant', 'site', 'comments', 'device_count', 'vm_count', 'tags')
default_columns = ('pk', 'name', 'type', 'group', 'tenant', 'site', 'device_count', 'vm_count')
@@ -143,6 +145,7 @@ class VirtualMachineDetailTable(VirtualMachineTable):
order_by=('primary_ip6', 'primary_ip4'),
verbose_name='IP Address'
)
comments = MarkdownColumn()
tags = TagColumn(
url_name='virtualization:virtualmachine_list'
)
@@ -151,7 +154,7 @@ class VirtualMachineDetailTable(VirtualMachineTable):
model = VirtualMachine
fields = (
'pk', 'name', 'status', 'cluster', 'role', 'tenant', 'platform', 'vcpus', 'memory', 'disk', 'primary_ip4',
'primary_ip6', 'primary_ip', 'tags',
'primary_ip6', 'primary_ip', 'comments', 'tags',
)
default_columns = (
'pk', 'name', 'status', 'cluster', 'role', 'tenant', 'vcpus', 'memory', 'disk', 'primary_ip',