From 7120a0384c9af165656934b4206eb1966869a867 Mon Sep 17 00:00:00 2001 From: Arthur Date: Mon, 13 Mar 2023 15:12:00 -0700 Subject: [PATCH] 9608 fix choices default --- netbox/dcim/api/serializers.py | 6 +++++- netbox/tenancy/api/serializers.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index 19fce011e..86e7dded1 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -644,7 +644,7 @@ class DeviceSerializer(NetBoxModelSerializer): site = NestedSiteSerializer() location = NestedLocationSerializer(required=False, allow_null=True, default=None) rack = NestedRackSerializer(required=False, allow_null=True, default=None) - face = ChoiceField(choices=DeviceFaceChoices, allow_blank=True, default='') + face = ChoiceField(choices=DeviceFaceChoices, allow_blank=True, default=lambda: '') position = serializers.DecimalField( max_digits=4, decimal_places=1, @@ -1168,15 +1168,19 @@ class PowerFeedSerializer(NetBoxModelSerializer, CabledObjectSerializer, Connect ) type = ChoiceField( choices=PowerFeedTypeChoices, + default=lambda: PowerFeedTypeChoices.TYPE_PRIMARY, ) status = ChoiceField( choices=PowerFeedStatusChoices, + default=lambda: PowerFeedStatusChoices.STATUS_ACTIVE, ) supply = ChoiceField( choices=PowerFeedSupplyChoices, + default=lambda: PowerFeedSupplyChoices.SUPPLY_AC, ) phase = ChoiceField( choices=PowerFeedPhaseChoices, + default=lambda: PowerFeedPhaseChoices.PHASE_SINGLE, ) class Meta: diff --git a/netbox/tenancy/api/serializers.py b/netbox/tenancy/api/serializers.py index de10a8b10..75d68a4a5 100644 --- a/netbox/tenancy/api/serializers.py +++ b/netbox/tenancy/api/serializers.py @@ -99,7 +99,7 @@ class ContactAssignmentSerializer(NetBoxModelSerializer): object = serializers.SerializerMethodField(read_only=True) contact = NestedContactSerializer() role = NestedContactRoleSerializer(required=False, allow_null=True) - priority = extend_schema_field(OpenApiTypes.STR)(ChoiceField(choices=ContactPriorityChoices, allow_blank=True, required=False, default='')) + priority = ChoiceField(choices=ContactPriorityChoices, allow_blank=True, required=False, default=lambda: '') class Meta: model = ContactAssignment