diff --git a/docs/release-notes/version-3.3.md b/docs/release-notes/version-3.3.md index fe13eaf9f..049e8acc5 100644 --- a/docs/release-notes/version-3.3.md +++ b/docs/release-notes/version-3.3.md @@ -2,6 +2,10 @@ ## v3.3.3 (FUTURE) +### Enhancements + +* [#10268](https://github.com/netbox-community/netbox/issues/10268) - Omit trailing ".0" in device positions within UI + ### Bug Fixes * [#9231](https://github.com/netbox-community/netbox/issues/9231) - Fix `empty` lookup expression for string filters diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py index 036f83306..c42731b90 100644 --- a/netbox/dcim/tables/devices.py +++ b/netbox/dcim/tables/devices.py @@ -152,6 +152,9 @@ class DeviceTable(TenancyColumnsMixin, NetBoxTable): rack = tables.Column( linkify=True ) + position = columns.TemplateColumn( + template_code='{{ value|floatformat }}' + ) device_role = columns.ColoredLabelColumn( verbose_name='Role' ) @@ -199,10 +202,10 @@ class DeviceTable(TenancyColumnsMixin, NetBoxTable): class Meta(NetBoxTable.Meta): model = Device fields = ( - 'pk', 'id', 'name', 'status', 'tenant', 'tenant_group', 'device_role', 'manufacturer', 'device_type', 'platform', 'serial', - 'asset_tag', 'site', 'location', 'rack', 'position', 'face', 'primary_ip', 'airflow', 'primary_ip4', - 'primary_ip6', 'cluster', 'virtual_chassis', 'vc_position', 'vc_priority', 'comments', 'contacts', 'tags', - 'created', 'last_updated', + 'pk', 'id', 'name', 'status', 'tenant', 'tenant_group', 'device_role', 'manufacturer', 'device_type', + 'platform', 'serial', 'asset_tag', 'site', 'location', 'rack', 'position', 'face', 'primary_ip', 'airflow', + 'primary_ip4', 'primary_ip6', 'cluster', 'virtual_chassis', 'vc_position', 'vc_priority', 'comments', + 'contacts', 'tags', 'created', 'last_updated', ) default_columns = ( 'pk', 'name', 'status', 'tenant', 'site', 'location', 'rack', 'device_role', 'manufacturer', 'device_type', diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 8a70db621..6cc859749 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -70,7 +70,7 @@ {% endif %} {% endwith %} {% elif object.rack and object.position %} - U{{ object.position }} / {{ object.get_face_display }} + U{{ object.position|floatformat }} / {{ object.get_face_display }} {% elif object.rack and object.device_type.u_height %} Not racked {% else %} diff --git a/netbox/templates/dcim/virtualchassis_edit.html b/netbox/templates/dcim/virtualchassis_edit.html index 275391c61..87917f2a2 100644 --- a/netbox/templates/dcim/virtualchassis_edit.html +++ b/netbox/templates/dcim/virtualchassis_edit.html @@ -55,7 +55,7 @@