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 develop into issue

Browse Source
This commit is contained in:
Alex Gittings
2022-03-09 17:47:58 +00:00
parent 27dab262de 8cd24b1a67
commit ef6576bdd6
42 changed files with 469 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
netbox/dcim/tables/sites.py
View File

@ -91,6 +91,10 @@ class SiteTable(BaseTable):
accessor=tables.A('asns__count'),
viewname='ipam:asn_list',
url_params={'site_id': 'pk'},
verbose_name='ASN Count'
)
asns = tables.ManyToManyColumn(
linkify_item=True,
verbose_name='ASNs'
)
tenant = TenantColumn()
@ -105,9 +109,15 @@ class SiteTable(BaseTable):
class Meta(BaseTable.Meta):
model = Site
fields = (
<<<<<<< HEAD
'pk', 'id', 'name', 'slug', 'status', 'facility', 'region', 'group', 'tenant', 'asn_count', 'time_zone',
'description', 'physical_address', 'shipping_address', 'latitude', 'longitude', 'contact_name',
'contact_phone', 'contact_email', 'contacts', 'comments', 'tags', 'created', 'last_updated',
=======
'pk', 'id', 'name', 'slug', 'status', 'facility', 'region', 'group', 'tenant', 'asns', 'asn_count',
'time_zone', 'description', 'physical_address', 'shipping_address', 'latitude', 'longitude', 'contact_name',
'contact_phone', 'contact_email', 'comments', 'tags', 'created', 'last_updated',
>>>>>>> develop
)
default_columns = ('pk', 'name', 'status', 'facility', 'region', 'group', 'tenant', 'description')