Просмотр исходного кода

Mark provider_account as not required in API and bulk import

kkthxbye-code 2 лет назад
Родитель
Сommit
528fb21a7e
2 измененных файлов с 3 добавлено и 2 удалено
  1. 1 1
      netbox/circuits/api/serializers.py
  2. 2 1
      netbox/circuits/forms/bulk_import.py

+ 1 - 1
netbox/circuits/api/serializers.py

@@ -106,7 +106,7 @@ class CircuitCircuitTerminationSerializer(WritableNestedSerializer):
 class CircuitSerializer(NetBoxModelSerializer):
 class CircuitSerializer(NetBoxModelSerializer):
     url = serializers.HyperlinkedIdentityField(view_name='circuits-api:circuit-detail')
     url = serializers.HyperlinkedIdentityField(view_name='circuits-api:circuit-detail')
     provider = NestedProviderSerializer()
     provider = NestedProviderSerializer()
-    provider_account = NestedProviderAccountSerializer()
+    provider_account = NestedProviderAccountSerializer(required=False, allow_null=True)
     status = ChoiceField(choices=CircuitStatusChoices, required=False)
     status = ChoiceField(choices=CircuitStatusChoices, required=False)
     type = NestedCircuitTypeSerializer()
     type = NestedCircuitTypeSerializer()
     tenant = NestedTenantSerializer(required=False, allow_null=True)
     tenant = NestedTenantSerializer(required=False, allow_null=True)

+ 2 - 1
netbox/circuits/forms/bulk_import.py

@@ -74,7 +74,8 @@ class CircuitImportForm(NetBoxModelImportForm):
     provider_account = CSVModelChoiceField(
     provider_account = CSVModelChoiceField(
         queryset=ProviderAccount.objects.all(),
         queryset=ProviderAccount.objects.all(),
         to_field_name='name',
         to_field_name='name',
-        help_text=_('Assigned provider account')
+        help_text=_('Assigned provider account'),
+        required=False
     )
     )
     type = CSVModelChoiceField(
     type = CSVModelChoiceField(
         queryset=CircuitType.objects.all(),
         queryset=CircuitType.objects.all(),