diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py index b038159b5..4b39dc27e 100644 --- a/netbox/dcim/tests/test_views.py +++ b/netbox/dcim/tests/test_views.py @@ -17,7 +17,7 @@ from dcim.constants import * from dcim.models import * from ipam.models import ASN, RIR, VLAN, VRF from tenancy.models import Tenant -from utilities.forms.choices import ImportFormatChoices +from utilities.choices import ImportFormatChoices from utilities.testing import ViewTestCases, create_tags, create_test_device, post_data from wireless.models import WirelessLAN diff --git a/netbox/netbox/tests/test_import.py b/netbox/netbox/tests/test_import.py index b6f732bfe..88d2605c5 100644 --- a/netbox/netbox/tests/test_import.py +++ b/netbox/netbox/tests/test_import.py @@ -3,7 +3,7 @@ from django.test import override_settings from dcim.models import * from users.models import ObjectPermission -from utilities.forms.choices import ImportFormatChoices +from utilities.choices import ImportFormatChoices from utilities.testing import ModelViewTestCase, create_tags diff --git a/netbox/netbox/views/generic/bulk_views.py b/netbox/netbox/views/generic/bulk_views.py index 445bfa261..75416f097 100644 --- a/netbox/netbox/views/generic/bulk_views.py +++ b/netbox/netbox/views/generic/bulk_views.py @@ -16,10 +16,10 @@ from django_tables2.export import TableExport from extras.models import ExportTemplate from extras.signals import clear_webhooks +from utilities.choices import ImportFormatChoices from utilities.error_handlers import handle_protectederror from utilities.exceptions import AbortRequest, AbortTransaction, PermissionsViolation from utilities.forms import BulkRenameForm, ConfirmationForm, ImportForm, restrict_form_fields -from utilities.forms.choices import ImportFormatChoices from utilities.htmx import is_htmx from utilities.permissions import get_permission_for_model from utilities.views import GetReturnURLMixin diff --git a/netbox/utilities/choices.py b/netbox/utilities/choices.py index c5b5bafb9..7982d56ae 100644 --- a/netbox/utilities/choices.py +++ b/netbox/utilities/choices.py @@ -197,3 +197,19 @@ class ButtonColorChoices(ChoiceSet): (BLACK, 'Black'), (WHITE, 'White'), ) + + +# +# Import Choices +# + +class ImportFormatChoices(ChoiceSet): + CSV = 'csv' + JSON = 'json' + YAML = 'yaml' + + CHOICES = [ + (CSV, 'CSV'), + (JSON, 'JSON'), + (YAML, 'YAML'), + ] diff --git a/netbox/utilities/forms/choices.py b/netbox/utilities/forms/choices.py deleted file mode 100644 index bf0ea5f94..000000000 --- a/netbox/utilities/forms/choices.py +++ /dev/null @@ -1,17 +0,0 @@ -from utilities.choices import ChoiceSet - - -# -# Import Choices -# - -class ImportFormatChoices(ChoiceSet): - CSV = 'csv' - JSON = 'json' - YAML = 'yaml' - - CHOICES = [ - (CSV, 'CSV'), - (JSON, 'JSON'), - (YAML, 'YAML'), - ] diff --git a/netbox/utilities/forms/forms.py b/netbox/utilities/forms/forms.py index bcc598e3c..9a7b729fe 100644 --- a/netbox/utilities/forms/forms.py +++ b/netbox/utilities/forms/forms.py @@ -7,8 +7,8 @@ import yaml from django import forms from django.utils.translation import gettext as _ +from utilities.choices import ImportFormatChoices from utilities.forms.utils import parse_csv -from .choices import ImportFormatChoices from .widgets import APISelect, APISelectMultiple, ClearableFileInput, StaticSelect __all__ = ( diff --git a/netbox/utilities/testing/views.py b/netbox/utilities/testing/views.py index 5e1e207cc..0a16c4b3b 100644 --- a/netbox/utilities/testing/views.py +++ b/netbox/utilities/testing/views.py @@ -9,7 +9,7 @@ from django.urls import reverse from extras.choices import ObjectChangeActionChoices from extras.models import ObjectChange from users.models import ObjectPermission -from utilities.forms.choices import ImportFormatChoices +from utilities.choices import ImportFormatChoices from .base import ModelTestCase from .utils import disable_warnings, post_data