Skip to content

Commit

Permalink
Fixes #6104: Fix location column on racks table
Browse files Browse the repository at this point in the history
  • Loading branch information
jeremystretch committed Apr 7, 2021
1 parent b5ad29e commit 59e185b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions docs/release-notes/version-2.11.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
### Bug Fixes (from Beta)

* [#6100](https://github.com/netbox-community/netbox/issues/6100) - Fix VM interfaces table "add interfaces" link
* [#6104](https://github.com/netbox-community/netbox/issues/6104) - Fix location column on racks table

---

Expand Down
10 changes: 5 additions & 5 deletions netbox/dcim/tables/racks.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class RackTable(BaseTable):
order_by=('_name',),
linkify=True
)
group = tables.Column(
location = tables.Column(
linkify=True
)
site = tables.Column(
Expand All @@ -88,10 +88,10 @@ class RackTable(BaseTable):
class Meta(BaseTable.Meta):
model = Rack
fields = (
'pk', 'name', 'site', 'group', 'status', 'facility_id', 'tenant', 'role', 'serial', 'asset_tag', 'type',
'pk', 'name', 'site', 'location', 'status', 'facility_id', 'tenant', 'role', 'serial', 'asset_tag', 'type',
'width', 'u_height',
)
default_columns = ('pk', 'name', 'site', 'group', 'status', 'facility_id', 'tenant', 'role', 'u_height')
default_columns = ('pk', 'name', 'site', 'location', 'status', 'facility_id', 'tenant', 'role', 'u_height')


class RackDetailTable(RackTable):
Expand All @@ -113,11 +113,11 @@ class RackDetailTable(RackTable):

class Meta(RackTable.Meta):
fields = (
'pk', 'name', 'site', 'group', 'status', 'facility_id', 'tenant', 'role', 'serial', 'asset_tag', 'type',
'pk', 'name', 'site', 'location', 'status', 'facility_id', 'tenant', 'role', 'serial', 'asset_tag', 'type',
'width', 'u_height', 'device_count', 'get_utilization', 'get_power_utilization', 'tags',
)
default_columns = (
'pk', 'name', 'site', 'group', 'status', 'facility_id', 'tenant', 'role', 'u_height', 'device_count',
'pk', 'name', 'site', 'location', 'status', 'facility_id', 'tenant', 'role', 'u_height', 'device_count',
'get_utilization', 'get_power_utilization',
)

Expand Down

0 comments on commit 59e185b

Please sign in to comment.