mirror of
https://github.com/netbox-community/netbox.git
synced 2024-05-10 07:54:54 +00:00
Closes #9099: Enable display of installed module serial & asset tag in module bays list
This commit is contained in:
@ -6,6 +6,7 @@
|
|||||||
|
|
||||||
* [#5479](https://github.com/netbox-community/netbox/issues/5479) - Allow custom job timeouts for scripts & reports
|
* [#5479](https://github.com/netbox-community/netbox/issues/5479) - Allow custom job timeouts for scripts & reports
|
||||||
* [#8973](https://github.com/netbox-community/netbox/issues/8973) - Display VLAN group count under site view
|
* [#8973](https://github.com/netbox-community/netbox/issues/8973) - Display VLAN group count under site view
|
||||||
|
* [#9099](https://github.com/netbox-community/netbox/issues/9099) - Enable display of installed module serial & asset tag in module bays list
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|
||||||
|
@ -739,13 +739,22 @@ class ModuleBayTable(DeviceComponentTable):
|
|||||||
linkify=True,
|
linkify=True,
|
||||||
verbose_name='Installed module'
|
verbose_name='Installed module'
|
||||||
)
|
)
|
||||||
|
module_serial = tables.Column(
|
||||||
|
accessor=tables.A('installed_module__serial')
|
||||||
|
)
|
||||||
|
module_asset_tag = tables.Column(
|
||||||
|
accessor=tables.A('installed_module__asset_tag')
|
||||||
|
)
|
||||||
tags = columns.TagColumn(
|
tags = columns.TagColumn(
|
||||||
url_name='dcim:modulebay_list'
|
url_name='dcim:modulebay_list'
|
||||||
)
|
)
|
||||||
|
|
||||||
class Meta(DeviceComponentTable.Meta):
|
class Meta(DeviceComponentTable.Meta):
|
||||||
model = ModuleBay
|
model = ModuleBay
|
||||||
fields = ('pk', 'id', 'name', 'device', 'label', 'position', 'installed_module', 'description', 'tags')
|
fields = (
|
||||||
|
'pk', 'id', 'name', 'device', 'label', 'position', 'installed_module', 'module_serial', 'module_asset_tag',
|
||||||
|
'description', 'tags',
|
||||||
|
)
|
||||||
default_columns = ('pk', 'name', 'device', 'label', 'installed_module', 'description')
|
default_columns = ('pk', 'name', 'device', 'label', 'installed_module', 'description')
|
||||||
|
|
||||||
|
|
||||||
@ -756,7 +765,10 @@ class DeviceModuleBayTable(ModuleBayTable):
|
|||||||
|
|
||||||
class Meta(DeviceComponentTable.Meta):
|
class Meta(DeviceComponentTable.Meta):
|
||||||
model = ModuleBay
|
model = ModuleBay
|
||||||
fields = ('pk', 'id', 'name', 'label', 'position', 'installed_module', 'description', 'tags', 'actions')
|
fields = (
|
||||||
|
'pk', 'id', 'name', 'label', 'position', 'installed_module', 'module_serial', 'module_asset_tag',
|
||||||
|
'description', 'tags', 'actions',
|
||||||
|
)
|
||||||
default_columns = ('pk', 'name', 'label', 'installed_module', 'description')
|
default_columns = ('pk', 'name', 'label', 'installed_module', 'description')
|
||||||
|
|
||||||
|
|
||||||
|
@ -52,6 +52,10 @@
|
|||||||
{% if object.installed_module %}
|
{% if object.installed_module %}
|
||||||
{% with module=object.installed_module %}
|
{% with module=object.installed_module %}
|
||||||
<table class="table table-hover attr-table">
|
<table class="table table-hover attr-table">
|
||||||
|
<tr>
|
||||||
|
<th scope="row">Module</th>
|
||||||
|
<td>{{ module|linkify }}</td>
|
||||||
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<th scope="row">Manufacturer</th>
|
<th scope="row">Manufacturer</th>
|
||||||
<td>{{ module.module_type.manufacturer|linkify }}</td>
|
<td>{{ module.module_type.manufacturer|linkify }}</td>
|
||||||
@ -60,6 +64,14 @@
|
|||||||
<th scope="row">Module Type</th>
|
<th scope="row">Module Type</th>
|
||||||
<td>{{ module.module_type|linkify }}</td>
|
<td>{{ module.module_type|linkify }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th scope="row">Serial Number</th>
|
||||||
|
<td class="font-monospace">{{ module.serial|placeholder }}</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th scope="row">Asset Tag</th>
|
||||||
|
<td class="font-monospace">{{ module.asset_tag|placeholder }}</td>
|
||||||
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
{% endwith %}
|
{% endwith %}
|
||||||
{% else %}
|
{% else %}
|
||||||
|
Reference in New Issue
Block a user