From b841875f6375990a4bf066abb888a6eb8ffeef05 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 25 Nov 2024 15:30:15 -0500 Subject: [PATCH] #16783: Misc cleanup --- netbox/dcim/forms/filtersets.py | 2 +- netbox/templates/dcim/inventoryitem.html | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/netbox/dcim/forms/filtersets.py b/netbox/dcim/forms/filtersets.py index 4a373a996..37b8afd17 100644 --- a/netbox/dcim/forms/filtersets.py +++ b/netbox/dcim/forms/filtersets.py @@ -1524,7 +1524,7 @@ class InventoryItemFilterForm(DeviceComponentFilterForm): fieldsets = ( FieldSet('q', 'filter_id', 'tag'), FieldSet( - 'name', 'label', 'role_id', 'manufacturer_id', 'serial', 'asset_tag', 'discovered', + 'name', 'label', 'status', 'role_id', 'manufacturer_id', 'serial', 'asset_tag', 'discovered', name=_('Attributes') ), FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')), diff --git a/netbox/templates/dcim/inventoryitem.html b/netbox/templates/dcim/inventoryitem.html index f17bf2ade..fd8ea42eb 100644 --- a/netbox/templates/dcim/inventoryitem.html +++ b/netbox/templates/dcim/inventoryitem.html @@ -32,6 +32,10 @@ {% trans "Label" %} {{ object.label|placeholder }} + + {% trans "Status" %} + {% badge object.get_status_display bg_color=object.get_status_color %} + {% trans "Role" %} {{ object.role|linkify|placeholder }} @@ -56,10 +60,6 @@ {% trans "Asset Tag" %} {{ object.asset_tag|placeholder }} - - {% trans "Status" %} - {% badge object.get_status_display bg_color=object.get_status_color %} - {% trans "Description" %} {{ object.description|placeholder }}