From 84b4ab1c5ef574d2eca72f88930bb3321b4bc886 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 27 Oct 2023 11:12:08 -0400 Subject: [PATCH] Tweak display of deprecated disk field --- .../virtualization/virtualmachine.html | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html index 40979a9aa..f14ba1c86 100644 --- a/netbox/templates/virtualization/virtualmachine.html +++ b/netbox/templates/virtualization/virtualmachine.html @@ -138,23 +138,23 @@ {% endif %} - {% if object.disk %} - {% trans "Disk Space" %} {% trans "(deprecated)" %} - - {{ object.disk }} {% trans "GB" context "Abbreviation for gigabyte" %} - - - {% endif %} - - {% trans "Virtual Disk Space" %} - - {% if object.disk_size %} - {{ object.disk_size }} {% trans "GB" context "Abbreviation for gigabyte" %} - {% else %} - {{ ''|placeholder }} - {% endif %} - + + {% trans "Disk Space" %} + + + {% if object.disk %} + {{ object.disk }} {% trans "GB" context "Abbreviation for gigabyte" %} + + + + {% elif object.disk_size %} + {{ object.disk_size }} {% trans "GB" context "Abbreviation for gigabyte" %} + ({{ object.virtualdisks.count }} {% trans "disks" %}) + {% else %} + {{ ''|placeholder }} + {% endif %} +