NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-01-09 21:32:17 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge v2.11.2

Browse Source
This commit is contained in:
jeremystretch
2021-04-27 14:05:38 -04:00
parent 368c2aac24 51f6d2f45e
commit 456ffb79ff
26 changed files with 138 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
netbox/dcim/tables/racks.py
View File

@@ -73,6 +73,7 @@ class RackDetailTable(RackTable):
verbose_name='Devices'
)
get_utilization = UtilizationColumn(
orderable=False,
verbose_name='Space'
)
get_power_utilization = UtilizationColumn(

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

@@ -102,10 +102,14 @@ class LocationTable(BaseTable):
site = tables.Column(
linkify=True
)
rack_count = tables.Column(
rack_count = LinkedCountColumn(
viewname='dcim:rack_list',
url_params={'location_id': 'pk'},
verbose_name='Racks'
)
device_count = tables.Column(
device_count = LinkedCountColumn(
viewname='dcim:device_list',
url_params={'location_id': 'pk'},
verbose_name='Devices'
)
actions = ButtonsColumn(