Fixes #21518: Ensure proper display of decimal custom fields with a zero value

Closes #21394

netbox/dcim/choices.py

@@ -921,6 +921,7 @@ class InterfaceTypeChoices(ChoiceSet):
     # 10 Gbps Ethernet
     TYPE_10GE_BR_D = '10gbase-br-d'
     TYPE_10GE_BR_U = '10gbase-br-u'
+    TYPE_10GE_CU = '10gbase-cu'
     TYPE_10GE_CX4 = '10gbase-cx4'
     TYPE_10GE_ER = '10gbase-er'
     TYPE_10GE_LR = '10gbase-lr'
@@ -943,6 +944,7 @@ class InterfaceTypeChoices(ChoiceSet):
     TYPE_40GE_FR4 = '40gbase-fr4'
     TYPE_40GE_LR4 = '40gbase-lr4'
     TYPE_40GE_SR4 = '40gbase-sr4'
+    TYPE_40GE_SR4_BD = '40gbase-sr4-bd'
 
     # 50 Gbps Ethernet
     TYPE_50GE_CR = '50gbase-cr'
@@ -1192,6 +1194,7 @@ class InterfaceTypeChoices(ChoiceSet):
             (
                 (TYPE_10GE_BR_D, '10GBASE-BR-D (10GE BiDi Down)'),
                 (TYPE_10GE_BR_U, '10GBASE-BR-U (10GE BiDi Up)'),
+                (TYPE_10GE_CU, '10GBASE-CU (10GE DAC Passive Twinax)'),
                 (TYPE_10GE_CX4, '10GBASE-CX4 (10GE DAC)'),
                 (TYPE_10GE_ER, '10GBASE-ER (10GE)'),
                 (TYPE_10GE_LR, '10GBASE-LR (10GE)'),
@@ -1220,6 +1223,7 @@ class InterfaceTypeChoices(ChoiceSet):
                 (TYPE_40GE_FR4, '40GBASE-FR4 (40GE)'),
                 (TYPE_40GE_LR4, '40GBASE-LR4 (40GE)'),
                 (TYPE_40GE_SR4, '40GBASE-SR4 (40GE)'),
+                (TYPE_40GE_SR4_BD, '40GBASE-SR4 (40GE BiDi)'),
             )
         ),
         (

netbox/extras/graphql/mixins.py

@@ -22,7 +22,19 @@ if TYPE_CHECKING:
 @strawberry.type
 class ConfigContextMixin:
 
-    @strawberry_django.field
+    @classmethod
+    def get_queryset(cls, queryset, info: Info, **kwargs):
+        queryset = super().get_queryset(queryset, info, **kwargs)
+
+        # If `config_context` is requested, call annotate_config_context_data() on the queryset
+        selected = {f.name for f in info.selected_fields[0].selections}
+        if 'config_context' in selected and hasattr(queryset, 'annotate_config_context_data'):
+            return queryset.annotate_config_context_data()
+
+        return queryset
+
+    # Ensure `local_context_data` is fetched when `config_context` is requested
+    @strawberry_django.field(only=['local_context_data'])
     def config_context(self) -> strawberry.scalars.JSON:
         return self.get_config_context()
 

netbox/utilities/templates/builtins/customfield_value.html

@@ -2,6 +2,8 @@
 {% load i18n %}
 {% if customfield.type == 'integer' and value is not None %}
   {{ value }}
+{% elif customfield.type == 'decimal' and value is not None %}
+  {{ value }}
 {% elif customfield.type == 'longtext' and value %}
   {{ value|markdown }}
 {% elif customfield.type == 'boolean' and value == True %}