From ebfab052043f86a61e5f6b3837ba0f783162389c Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Fri, 14 Apr 2023 10:09:24 -0400 Subject: [PATCH] Clean up import statements for utilities.forms --- netbox/circuits/forms/bulk_edit.py | 6 +++--- netbox/circuits/forms/bulk_import.py | 3 ++- netbox/circuits/forms/filtersets.py | 3 ++- netbox/circuits/forms/model_forms.py | 5 ++--- netbox/core/forms/bulk_edit.py | 4 +++- netbox/core/forms/filtersets.py | 7 +++---- netbox/core/forms/model_forms.py | 3 ++- netbox/dcim/forms/bulk_create.py | 3 ++- netbox/dcim/forms/bulk_edit.py | 7 +++---- netbox/dcim/forms/bulk_import.py | 5 +++-- netbox/dcim/forms/common.py | 2 +- netbox/dcim/forms/connections.py | 4 ++-- netbox/dcim/forms/filtersets.py | 7 +++---- netbox/dcim/forms/model_forms.py | 9 +++++---- netbox/dcim/forms/object_create.py | 2 +- netbox/extras/forms/bulk_edit.py | 6 +++--- netbox/extras/forms/bulk_import.py | 3 ++- netbox/extras/forms/filtersets.py | 7 +++---- netbox/extras/forms/model_forms.py | 7 ++++--- netbox/extras/forms/reports.py | 4 ++-- netbox/extras/forms/scripts.py | 3 ++- netbox/extras/scripts.py | 3 ++- netbox/ipam/forms/bulk_create.py | 3 ++- netbox/ipam/forms/bulk_edit.py | 7 ++++--- netbox/ipam/forms/bulk_import.py | 2 +- netbox/ipam/forms/filtersets.py | 6 +++--- netbox/ipam/forms/model_forms.py | 8 +++++--- netbox/netbox/filtersets.py | 2 +- netbox/tenancy/forms/bulk_edit.py | 3 ++- netbox/tenancy/forms/bulk_import.py | 2 +- netbox/tenancy/forms/forms.py | 2 +- netbox/tenancy/forms/model_forms.py | 5 ++--- netbox/users/forms.py | 3 ++- netbox/utilities/fields.py | 2 +- netbox/utilities/forms/__init__.py | 2 -- netbox/utilities/forms/fields/__init__.py | 1 + netbox/utilities/forms/{widgets => fields}/array.py | 0 netbox/utilities/forms/widgets/__init__.py | 1 - netbox/virtualization/forms/bulk_create.py | 3 ++- netbox/virtualization/forms/bulk_edit.py | 7 +++---- netbox/virtualization/forms/bulk_import.py | 5 +++-- netbox/virtualization/forms/filtersets.py | 5 ++--- netbox/virtualization/forms/model_forms.py | 6 +++--- netbox/virtualization/forms/object_create.py | 2 +- netbox/wireless/forms/bulk_edit.py | 3 ++- netbox/wireless/forms/bulk_import.py | 3 ++- netbox/wireless/forms/filtersets.py | 3 ++- netbox/wireless/forms/model_forms.py | 7 ++++--- 48 files changed, 105 insertions(+), 91 deletions(-) rename netbox/utilities/forms/{widgets => fields}/array.py (100%) diff --git a/netbox/circuits/forms/bulk_edit.py b/netbox/circuits/forms/bulk_edit.py index 39cdd85d0..efc9b5f3a 100644 --- a/netbox/circuits/forms/bulk_edit.py +++ b/netbox/circuits/forms/bulk_edit.py @@ -6,9 +6,9 @@ from circuits.models import * from ipam.models import ASN from netbox.forms import NetBoxModelBulkEditForm from tenancy.models import Tenant -from utilities.forms import ( - add_blank_choice, CommentField, DatePicker, DynamicModelChoiceField, DynamicModelMultipleChoiceField, -) +from utilities.forms import add_blank_choice +from utilities.forms.fields import CommentField, DynamicModelChoiceField, DynamicModelMultipleChoiceField +from utilities.forms.widgets import DatePicker __all__ = ( 'CircuitBulkEditForm', diff --git a/netbox/circuits/forms/bulk_import.py b/netbox/circuits/forms/bulk_import.py index 690cea828..d55831008 100644 --- a/netbox/circuits/forms/bulk_import.py +++ b/netbox/circuits/forms/bulk_import.py @@ -6,7 +6,8 @@ from dcim.models import Site from django.utils.translation import gettext as _ from netbox.forms import NetBoxModelImportForm from tenancy.models import Tenant -from utilities.forms import BootstrapMixin, CSVChoiceField, CSVModelChoiceField, SlugField +from utilities.forms import BootstrapMixin +from utilities.forms.fields import CSVChoiceField, CSVModelChoiceField, SlugField __all__ = ( 'CircuitImportForm', diff --git a/netbox/circuits/forms/filtersets.py b/netbox/circuits/forms/filtersets.py index aeeddfd36..075855f3b 100644 --- a/netbox/circuits/forms/filtersets.py +++ b/netbox/circuits/forms/filtersets.py @@ -7,7 +7,8 @@ from dcim.models import Region, Site, SiteGroup from ipam.models import ASN from netbox.forms import NetBoxModelFilterSetForm from tenancy.forms import TenancyFilterForm, ContactModelFilterForm -from utilities.forms import DatePicker, DynamicModelMultipleChoiceField, TagFilterField +from utilities.forms.fields import DynamicModelMultipleChoiceField, TagFilterField +from utilities.forms.widgets import DatePicker __all__ = ( 'CircuitFilterForm', diff --git a/netbox/circuits/forms/model_forms.py b/netbox/circuits/forms/model_forms.py index 8aeaa9619..2925efec1 100644 --- a/netbox/circuits/forms/model_forms.py +++ b/netbox/circuits/forms/model_forms.py @@ -5,9 +5,8 @@ from dcim.models import Site from ipam.models import ASN from netbox.forms import NetBoxModelForm from tenancy.forms import TenancyForm -from utilities.forms import ( - CommentField, DatePicker, DynamicModelChoiceField, DynamicModelMultipleChoiceField, SelectSpeedWidget, SlugField, -) +from utilities.forms.fields import CommentField, DynamicModelChoiceField, DynamicModelMultipleChoiceField, SlugField +from utilities.forms.widgets import DatePicker, SelectSpeedWidget __all__ = ( 'CircuitForm', diff --git a/netbox/core/forms/bulk_edit.py b/netbox/core/forms/bulk_edit.py index 5a24ba90f..de8727643 100644 --- a/netbox/core/forms/bulk_edit.py +++ b/netbox/core/forms/bulk_edit.py @@ -4,7 +4,9 @@ from django.utils.translation import gettext as _ from core.choices import DataSourceTypeChoices from core.models import * from netbox.forms import NetBoxModelBulkEditForm -from utilities.forms import add_blank_choice, BulkEditNullBooleanSelect, CommentField +from utilities.forms import add_blank_choice +from utilities.forms.fields import CommentField +from utilities.forms.widgets import BulkEditNullBooleanSelect __all__ = ( 'DataSourceBulkEditForm', diff --git a/netbox/core/forms/filtersets.py b/netbox/core/forms/filtersets.py index ee8faa125..7c3f2ab09 100644 --- a/netbox/core/forms/filtersets.py +++ b/netbox/core/forms/filtersets.py @@ -8,10 +8,9 @@ from core.models import * from extras.forms.mixins import SavedFiltersMixin from extras.utils import FeatureQuery from netbox.forms import NetBoxModelFilterSetForm -from utilities.forms import ( - APISelectMultiple, BOOLEAN_WITH_BLANK_CHOICES, ContentTypeChoiceField, DateTimePicker, - DynamicModelMultipleChoiceField, FilterForm, -) +from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES, FilterForm +from utilities.forms.fields import ContentTypeChoiceField, DynamicModelMultipleChoiceField +from utilities.forms.widgets import APISelectMultiple, DateTimePicker __all__ = ( 'DataFileFilterForm', diff --git a/netbox/core/forms/model_forms.py b/netbox/core/forms/model_forms.py index 67732d5be..304bc346a 100644 --- a/netbox/core/forms/model_forms.py +++ b/netbox/core/forms/model_forms.py @@ -6,7 +6,8 @@ from core.models import * from extras.forms.mixins import SyncedDataMixin from netbox.forms import NetBoxModelForm from netbox.registry import registry -from utilities.forms import CommentField, get_field_value +from utilities.forms import get_field_value +from utilities.forms.fields import CommentField from utilities.forms.widgets import HTMXSelect __all__ = ( diff --git a/netbox/dcim/forms/bulk_create.py b/netbox/dcim/forms/bulk_create.py index 4127aa3ea..179ff9b67 100644 --- a/netbox/dcim/forms/bulk_create.py +++ b/netbox/dcim/forms/bulk_create.py @@ -4,7 +4,8 @@ from dcim.models import * from django.utils.translation import gettext as _ from extras.forms import CustomFieldsMixin from extras.models import Tag -from utilities.forms import BootstrapMixin, DynamicModelMultipleChoiceField, ExpandableNameField, form_from_model +from utilities.forms import BootstrapMixin, form_from_model +from utilities.forms.fields import DynamicModelMultipleChoiceField, ExpandableNameField from .object_create import ComponentCreateForm __all__ = ( diff --git a/netbox/dcim/forms/bulk_edit.py b/netbox/dcim/forms/bulk_edit.py index 1a5257165..5966588fa 100644 --- a/netbox/dcim/forms/bulk_edit.py +++ b/netbox/dcim/forms/bulk_edit.py @@ -10,10 +10,9 @@ from extras.models import ConfigTemplate from ipam.models import ASN, VLAN, VLANGroup, VRF from netbox.forms import NetBoxModelBulkEditForm from tenancy.models import Tenant -from utilities.forms import ( - add_blank_choice, BulkEditForm, BulkEditNullBooleanSelect, ColorField, CommentField, DynamicModelChoiceField, - DynamicModelMultipleChoiceField, form_from_model, SelectSpeedWidget, -) +from utilities.forms import BulkEditForm, add_blank_choice, form_from_model +from utilities.forms.fields import ColorField, CommentField, DynamicModelChoiceField, DynamicModelMultipleChoiceField +from utilities.forms.widgets import BulkEditNullBooleanSelect, SelectSpeedWidget __all__ = ( 'CableBulkEditForm', diff --git a/netbox/dcim/forms/bulk_import.py b/netbox/dcim/forms/bulk_import.py index d596542af..73eda38fe 100644 --- a/netbox/dcim/forms/bulk_import.py +++ b/netbox/dcim/forms/bulk_import.py @@ -12,8 +12,9 @@ from extras.models import ConfigTemplate from ipam.models import VRF from netbox.forms import NetBoxModelImportForm from tenancy.models import Tenant -from utilities.forms import ( - CSVChoiceField, CSVContentTypeField, CSVModelChoiceField, CSVTypedChoiceField, SlugField, CSVModelMultipleChoiceField +from utilities.forms.fields import ( + CSVChoiceField, CSVContentTypeField, CSVModelChoiceField, CSVModelMultipleChoiceField, CSVTypedChoiceField, + SlugField, ) from virtualization.models import Cluster from wireless.choices import WirelessRoleChoices diff --git a/netbox/dcim/forms/common.py b/netbox/dcim/forms/common.py index f047d621b..064a9a80b 100644 --- a/netbox/dcim/forms/common.py +++ b/netbox/dcim/forms/common.py @@ -3,7 +3,7 @@ from django.utils.translation import gettext as _ from dcim.choices import * from dcim.constants import * -from utilities.forms.utils import get_field_value +from utilities.forms import get_field_value __all__ = ( 'InterfaceCommonForm', diff --git a/netbox/dcim/forms/connections.py b/netbox/dcim/forms/connections.py index 443dc9143..8e3dcdc68 100644 --- a/netbox/dcim/forms/connections.py +++ b/netbox/dcim/forms/connections.py @@ -1,9 +1,9 @@ from django import forms from django.utils.translation import gettext as _ -from circuits.models import Circuit, CircuitTermination, Provider +from circuits.models import Circuit, CircuitTermination from dcim.models import * -from utilities.forms import DynamicModelChoiceField, DynamicModelMultipleChoiceField +from utilities.forms.fields import DynamicModelChoiceField, DynamicModelMultipleChoiceField from .model_forms import CableForm diff --git a/netbox/dcim/forms/filtersets.py b/netbox/dcim/forms/filtersets.py index 4ccc2fe54..727064e8f 100644 --- a/netbox/dcim/forms/filtersets.py +++ b/netbox/dcim/forms/filtersets.py @@ -10,10 +10,9 @@ from extras.models import ConfigTemplate from ipam.models import ASN, L2VPN, VRF from netbox.forms import NetBoxModelFilterSetForm from tenancy.forms import ContactModelFilterForm, TenancyFilterForm -from utilities.forms import ( - APISelectMultiple, add_blank_choice, ColorField, DynamicModelMultipleChoiceField, FilterForm, - TagFilterField, BOOLEAN_WITH_BLANK_CHOICES, SelectSpeedWidget, -) +from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES, FilterForm, add_blank_choice +from utilities.forms.fields import ColorField, DynamicModelMultipleChoiceField, TagFilterField +from utilities.forms.widgets import APISelectMultiple, SelectSpeedWidget from wireless.choices import * __all__ = ( diff --git a/netbox/dcim/forms/model_forms.py b/netbox/dcim/forms/model_forms.py index 6c8ca7566..f899c31e1 100644 --- a/netbox/dcim/forms/model_forms.py +++ b/netbox/dcim/forms/model_forms.py @@ -11,11 +11,12 @@ from extras.models import ConfigTemplate from ipam.models import ASN, IPAddress, VLAN, VLANGroup, VRF from netbox.forms import NetBoxModelForm from tenancy.forms import TenancyForm -from utilities.forms import ( - add_blank_choice, BootstrapMixin, ClearableFileInput, CommentField, ContentTypeChoiceField, - DynamicModelChoiceField, DynamicModelMultipleChoiceField, JSONField, NumericArrayField, SlugField, +from utilities.forms import BootstrapMixin, add_blank_choice +from utilities.forms.fields import ( + CommentField, ContentTypeChoiceField, DynamicModelChoiceField, DynamicModelMultipleChoiceField, JSONField, + NumericArrayField, SlugField, ) -from utilities.forms.widgets import APISelect, HTMXSelect, SelectSpeedWidget, SelectWithPK +from utilities.forms.widgets import APISelect, ClearableFileInput, HTMXSelect, SelectSpeedWidget, SelectWithPK from virtualization.models import Cluster from wireless.models import WirelessLAN, WirelessLANGroup from .common import InterfaceCommonForm, ModuleCommonForm diff --git a/netbox/dcim/forms/object_create.py b/netbox/dcim/forms/object_create.py index 46f783cb7..3507faf3b 100644 --- a/netbox/dcim/forms/object_create.py +++ b/netbox/dcim/forms/object_create.py @@ -3,7 +3,7 @@ from django.utils.translation import gettext as _ from dcim.models import * from netbox.forms import NetBoxModelForm -from utilities.forms import DynamicModelChoiceField, DynamicModelMultipleChoiceField, ExpandableNameField +from utilities.forms.fields import DynamicModelChoiceField, DynamicModelMultipleChoiceField, ExpandableNameField from . import model_forms __all__ = ( diff --git a/netbox/extras/forms/bulk_edit.py b/netbox/extras/forms/bulk_edit.py index a4e0cabba..7c838be20 100644 --- a/netbox/extras/forms/bulk_edit.py +++ b/netbox/extras/forms/bulk_edit.py @@ -3,9 +3,9 @@ from django.utils.translation import gettext as _ from extras.choices import * from extras.models import * -from utilities.forms import ( - add_blank_choice, BulkEditForm, BulkEditNullBooleanSelect, ColorField, -) +from utilities.forms import BulkEditForm, add_blank_choice +from utilities.forms.fields import ColorField +from utilities.forms.widgets import BulkEditNullBooleanSelect __all__ = ( 'ConfigContextBulkEditForm', diff --git a/netbox/extras/forms/bulk_import.py b/netbox/extras/forms/bulk_import.py index 28791ceb8..c344a3214 100644 --- a/netbox/extras/forms/bulk_import.py +++ b/netbox/extras/forms/bulk_import.py @@ -7,7 +7,8 @@ from django.utils.translation import gettext as _ from extras.choices import CustomFieldVisibilityChoices, CustomFieldTypeChoices from extras.models import * from extras.utils import FeatureQuery -from utilities.forms import CSVChoiceField, CSVContentTypeField, CSVModelForm, CSVMultipleContentTypeField, SlugField +from utilities.forms import CSVModelForm +from utilities.forms.fields import CSVChoiceField, CSVContentTypeField, CSVMultipleContentTypeField, SlugField __all__ = ( 'ConfigTemplateImportForm', diff --git a/netbox/extras/forms/filtersets.py b/netbox/extras/forms/filtersets.py index 3a6c25cc7..056302343 100644 --- a/netbox/extras/forms/filtersets.py +++ b/netbox/extras/forms/filtersets.py @@ -10,10 +10,9 @@ from extras.models import * from extras.utils import FeatureQuery from netbox.forms.base import NetBoxModelFilterSetForm from tenancy.models import Tenant, TenantGroup -from utilities.forms import ( - add_blank_choice, APISelectMultiple, BOOLEAN_WITH_BLANK_CHOICES, ContentTypeMultipleChoiceField, DateTimePicker, - DynamicModelMultipleChoiceField, FilterForm, TagFilterField, -) +from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES, FilterForm, add_blank_choice +from utilities.forms.fields import ContentTypeMultipleChoiceField, DynamicModelMultipleChoiceField, TagFilterField +from utilities.forms.widgets import APISelectMultiple, DateTimePicker from virtualization.models import Cluster, ClusterGroup, ClusterType from .mixins import SavedFiltersMixin diff --git a/netbox/extras/forms/model_forms.py b/netbox/extras/forms/model_forms.py index c199d2b53..c7c55e282 100644 --- a/netbox/extras/forms/model_forms.py +++ b/netbox/extras/forms/model_forms.py @@ -12,9 +12,10 @@ from extras.models import * from extras.utils import FeatureQuery from netbox.forms import NetBoxModelForm from tenancy.models import Tenant, TenantGroup -from utilities.forms import ( - add_blank_choice, BootstrapMixin, CommentField, ContentTypeChoiceField, ContentTypeMultipleChoiceField, - DynamicModelMultipleChoiceField, JSONField, SlugField, +from utilities.forms import BootstrapMixin, add_blank_choice +from utilities.forms.fields import ( + CommentField, ContentTypeChoiceField, ContentTypeMultipleChoiceField, DynamicModelMultipleChoiceField, JSONField, + SlugField, ) from virtualization.models import Cluster, ClusterGroup, ClusterType diff --git a/netbox/extras/forms/reports.py b/netbox/extras/forms/reports.py index ed7f49304..6a0b99eec 100644 --- a/netbox/extras/forms/reports.py +++ b/netbox/extras/forms/reports.py @@ -1,8 +1,8 @@ from django import forms -from django.utils import timezone from django.utils.translation import gettext as _ -from utilities.forms import BootstrapMixin, DateTimePicker, SelectDurationWidget +from utilities.forms import BootstrapMixin +from utilities.forms.widgets import DateTimePicker, SelectDurationWidget from utilities.utils import local_now __all__ = ( diff --git a/netbox/extras/forms/scripts.py b/netbox/extras/forms/scripts.py index ca7398132..29e5f47ab 100644 --- a/netbox/extras/forms/scripts.py +++ b/netbox/extras/forms/scripts.py @@ -1,7 +1,8 @@ from django import forms from django.utils.translation import gettext as _ -from utilities.forms import BootstrapMixin, DateTimePicker, SelectDurationWidget +from utilities.forms import BootstrapMixin +from utilities.forms.widgets import DateTimePicker, SelectDurationWidget from utilities.utils import local_now __all__ = ( diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py index b5be917f3..db94b6cbf 100644 --- a/netbox/extras/scripts.py +++ b/netbox/extras/scripts.py @@ -21,7 +21,8 @@ from extras.signals import clear_webhooks from ipam.formfields import IPAddressFormField, IPNetworkFormField from ipam.validators import MaxPrefixLengthValidator, MinPrefixLengthValidator, prefix_validator from utilities.exceptions import AbortScript, AbortTransaction -from utilities.forms import add_blank_choice, DynamicModelChoiceField, DynamicModelMultipleChoiceField +from utilities.forms import add_blank_choice +from utilities.forms.fields import DynamicModelChoiceField, DynamicModelMultipleChoiceField from .context_managers import change_logging from .forms import ScriptForm diff --git a/netbox/ipam/forms/bulk_create.py b/netbox/ipam/forms/bulk_create.py index 6d07951a3..1ba786aae 100644 --- a/netbox/ipam/forms/bulk_create.py +++ b/netbox/ipam/forms/bulk_create.py @@ -1,7 +1,8 @@ from django import forms from django.utils.translation import gettext as _ -from utilities.forms import BootstrapMixin, ExpandableIPAddressField +from utilities.forms import BootstrapMixin +from utilities.forms.fields import ExpandableIPAddressField __all__ = ( 'IPAddressBulkCreateForm', diff --git a/netbox/ipam/forms/bulk_edit.py b/netbox/ipam/forms/bulk_edit.py index cd8ead81a..71ce14040 100644 --- a/netbox/ipam/forms/bulk_edit.py +++ b/netbox/ipam/forms/bulk_edit.py @@ -8,10 +8,11 @@ from ipam.models import * from ipam.models import ASN from netbox.forms import NetBoxModelBulkEditForm from tenancy.models import Tenant -from utilities.forms import ( - add_blank_choice, BulkEditNullBooleanSelect, CommentField, DynamicModelChoiceField, DynamicModelMultipleChoiceField, - NumericArrayField, +from utilities.forms import add_blank_choice +from utilities.forms.fields import ( + CommentField, DynamicModelChoiceField, DynamicModelMultipleChoiceField, NumericArrayField, ) +from utilities.forms.widgets import BulkEditNullBooleanSelect __all__ = ( 'AggregateBulkEditForm', diff --git a/netbox/ipam/forms/bulk_import.py b/netbox/ipam/forms/bulk_import.py index 67463ade8..fd0b315a0 100644 --- a/netbox/ipam/forms/bulk_import.py +++ b/netbox/ipam/forms/bulk_import.py @@ -9,7 +9,7 @@ from ipam.constants import * from ipam.models import * from netbox.forms import NetBoxModelImportForm from tenancy.models import Tenant -from utilities.forms import CSVChoiceField, CSVContentTypeField, CSVModelChoiceField, SlugField +from utilities.forms.fields import CSVChoiceField, CSVContentTypeField, CSVModelChoiceField, SlugField from virtualization.models import VirtualMachine, VMInterface __all__ = ( diff --git a/netbox/ipam/forms/filtersets.py b/netbox/ipam/forms/filtersets.py index 83fe84cd2..53fecfe2f 100644 --- a/netbox/ipam/forms/filtersets.py +++ b/netbox/ipam/forms/filtersets.py @@ -8,9 +8,9 @@ from ipam.constants import * from ipam.models import * from netbox.forms import NetBoxModelFilterSetForm from tenancy.forms import TenancyFilterForm -from utilities.forms import ( - add_blank_choice, ContentTypeMultipleChoiceField, DynamicModelChoiceField, DynamicModelMultipleChoiceField, - TagFilterField, BOOLEAN_WITH_BLANK_CHOICES, +from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES, add_blank_choice +from utilities.forms.fields import ( + ContentTypeMultipleChoiceField, DynamicModelChoiceField, DynamicModelMultipleChoiceField, TagFilterField, ) from virtualization.models import VirtualMachine diff --git a/netbox/ipam/forms/model_forms.py b/netbox/ipam/forms/model_forms.py index 3904281a8..9951b72e4 100644 --- a/netbox/ipam/forms/model_forms.py +++ b/netbox/ipam/forms/model_forms.py @@ -11,10 +11,12 @@ from ipam.models import * from netbox.forms import NetBoxModelForm from tenancy.forms import TenancyForm from utilities.exceptions import PermissionsViolation -from utilities.forms import ( - add_blank_choice, BootstrapMixin, CommentField, ContentTypeChoiceField, DatePicker, DynamicModelChoiceField, - DynamicModelMultipleChoiceField, NumericArrayField, SlugField, +from utilities.forms import BootstrapMixin, add_blank_choice +from utilities.forms.fields import ( + CommentField, ContentTypeChoiceField, DynamicModelChoiceField, DynamicModelMultipleChoiceField, NumericArrayField, + SlugField, ) +from utilities.forms.widgets import DatePicker from virtualization.models import Cluster, ClusterGroup, VirtualMachine, VMInterface __all__ = ( diff --git a/netbox/netbox/filtersets.py b/netbox/netbox/filtersets.py index 3ac9174de..a0c1edee8 100644 --- a/netbox/netbox/filtersets.py +++ b/netbox/netbox/filtersets.py @@ -14,7 +14,7 @@ from utilities.constants import ( FILTER_CHAR_BASED_LOOKUP_MAP, FILTER_NEGATION_LOOKUP_MAP, FILTER_TREENODE_NEGATION_LOOKUP_MAP, FILTER_NUMERIC_BASED_LOOKUP_MAP ) -from utilities.forms import MACAddressField +from utilities.forms.fields import MACAddressField from utilities import filters __all__ = ( diff --git a/netbox/tenancy/forms/bulk_edit.py b/netbox/tenancy/forms/bulk_edit.py index ae30d93ff..34ca35239 100644 --- a/netbox/tenancy/forms/bulk_edit.py +++ b/netbox/tenancy/forms/bulk_edit.py @@ -3,7 +3,8 @@ from django import forms from netbox.forms import NetBoxModelBulkEditForm from tenancy.choices import ContactPriorityChoices from tenancy.models import * -from utilities.forms import CommentField, DynamicModelChoiceField, add_blank_choice +from utilities.forms import add_blank_choice +from utilities.forms.fields import CommentField, DynamicModelChoiceField __all__ = ( 'ContactAssignmentBulkEditForm', diff --git a/netbox/tenancy/forms/bulk_import.py b/netbox/tenancy/forms/bulk_import.py index 8a251a316..f9b8accd9 100644 --- a/netbox/tenancy/forms/bulk_import.py +++ b/netbox/tenancy/forms/bulk_import.py @@ -1,7 +1,7 @@ from django.utils.translation import gettext as _ from netbox.forms import NetBoxModelImportForm from tenancy.models import * -from utilities.forms import CSVModelChoiceField, SlugField +from utilities.forms.fields import CSVModelChoiceField, SlugField __all__ = ( 'ContactImportForm', diff --git a/netbox/tenancy/forms/forms.py b/netbox/tenancy/forms/forms.py index 5e78bc540..789566e94 100644 --- a/netbox/tenancy/forms/forms.py +++ b/netbox/tenancy/forms/forms.py @@ -2,7 +2,7 @@ from django import forms from django.utils.translation import gettext as _ from tenancy.models import * -from utilities.forms import DynamicModelChoiceField, DynamicModelMultipleChoiceField +from utilities.forms.fields import DynamicModelChoiceField, DynamicModelMultipleChoiceField __all__ = ( 'ContactModelFilterForm', diff --git a/netbox/tenancy/forms/model_forms.py b/netbox/tenancy/forms/model_forms.py index a27e41f74..6d6534d40 100644 --- a/netbox/tenancy/forms/model_forms.py +++ b/netbox/tenancy/forms/model_forms.py @@ -2,9 +2,8 @@ from django import forms from netbox.forms import NetBoxModelForm from tenancy.models import * -from utilities.forms import ( - BootstrapMixin, CommentField, DynamicModelChoiceField, SlugField, -) +from utilities.forms import BootstrapMixin +from utilities.forms.fields import CommentField, DynamicModelChoiceField, SlugField __all__ = ( 'ContactAssignmentForm', diff --git a/netbox/users/forms.py b/netbox/users/forms.py index 0c7d7ea19..3dd5cb32f 100644 --- a/netbox/users/forms.py +++ b/netbox/users/forms.py @@ -7,7 +7,8 @@ from django.utils.translation import gettext as _ from ipam.formfields import IPNetworkFormField from netbox.preferences import PREFERENCES -from utilities.forms import BootstrapMixin, DateTimePicker +from utilities.forms import BootstrapMixin +from utilities.forms.widgets import DateTimePicker from utilities.utils import flatten_dict from .models import Token, UserConfig diff --git a/netbox/utilities/fields.py b/netbox/utilities/fields.py index d09cee025..8934e4ad6 100644 --- a/netbox/utilities/fields.py +++ b/netbox/utilities/fields.py @@ -4,7 +4,7 @@ from django.contrib.contenttypes.fields import GenericForeignKey from django.db import models from utilities.ordering import naturalize -from .forms import ColorSelect +from .forms.widgets import ColorSelect from .validators import ColorValidator __all__ = ( diff --git a/netbox/utilities/forms/__init__.py b/netbox/utilities/forms/__init__.py index 6b89d600b..94f7d48c9 100644 --- a/netbox/utilities/forms/__init__.py +++ b/netbox/utilities/forms/__init__.py @@ -1,6 +1,4 @@ from .constants import * -from .fields import * from .forms import * from .mixins import * from .utils import * -from .widgets import * diff --git a/netbox/utilities/forms/fields/__init__.py b/netbox/utilities/forms/fields/__init__.py index eacde0040..7f9f4b409 100644 --- a/netbox/utilities/forms/fields/__init__.py +++ b/netbox/utilities/forms/fields/__init__.py @@ -1,3 +1,4 @@ +from .array import * from .content_types import * from .csv import * from .dynamic import * diff --git a/netbox/utilities/forms/widgets/array.py b/netbox/utilities/forms/fields/array.py similarity index 100% rename from netbox/utilities/forms/widgets/array.py rename to netbox/utilities/forms/fields/array.py diff --git a/netbox/utilities/forms/widgets/__init__.py b/netbox/utilities/forms/widgets/__init__.py index 3369f44c7..9bd9f4faa 100644 --- a/netbox/utilities/forms/widgets/__init__.py +++ b/netbox/utilities/forms/widgets/__init__.py @@ -1,5 +1,4 @@ from .apiselect import * -from .array import * from .datetime import * from .misc import * from .select import * diff --git a/netbox/virtualization/forms/bulk_create.py b/netbox/virtualization/forms/bulk_create.py index 54722c7b1..0b762f38e 100644 --- a/netbox/virtualization/forms/bulk_create.py +++ b/netbox/virtualization/forms/bulk_create.py @@ -1,7 +1,8 @@ from django import forms from django.utils.translation import gettext as _ -from utilities.forms import BootstrapMixin, ExpandableNameField, form_from_model +from utilities.forms import BootstrapMixin, form_from_model +from utilities.forms.fields import ExpandableNameField from virtualization.models import VMInterface, VirtualMachine __all__ = ( diff --git a/netbox/virtualization/forms/bulk_edit.py b/netbox/virtualization/forms/bulk_edit.py index 110a304ad..9aa771d29 100644 --- a/netbox/virtualization/forms/bulk_edit.py +++ b/netbox/virtualization/forms/bulk_edit.py @@ -7,10 +7,9 @@ from dcim.models import Device, DeviceRole, Platform, Region, Site, SiteGroup from ipam.models import VLAN, VLANGroup, VRF from netbox.forms import NetBoxModelBulkEditForm from tenancy.models import Tenant -from utilities.forms import ( - add_blank_choice, BulkEditNullBooleanSelect, BulkRenameForm, CommentField, DynamicModelChoiceField, - DynamicModelMultipleChoiceField -) +from utilities.forms import BulkRenameForm, add_blank_choice +from utilities.forms.fields import CommentField, DynamicModelChoiceField, DynamicModelMultipleChoiceField +from utilities.forms.widgets import BulkEditNullBooleanSelect from virtualization.choices import * from virtualization.models import * diff --git a/netbox/virtualization/forms/bulk_import.py b/netbox/virtualization/forms/bulk_import.py index 8ed83b46c..a229bd935 100644 --- a/netbox/virtualization/forms/bulk_import.py +++ b/netbox/virtualization/forms/bulk_import.py @@ -1,10 +1,11 @@ +from django.utils.translation import gettext as _ + from dcim.choices import InterfaceModeChoices from dcim.models import Device, DeviceRole, Platform, Site -from django.utils.translation import gettext as _ from ipam.models import VRF from netbox.forms import NetBoxModelImportForm from tenancy.models import Tenant -from utilities.forms import CSVChoiceField, CSVModelChoiceField, SlugField +from utilities.forms.fields import CSVChoiceField, CSVModelChoiceField, SlugField from virtualization.choices import * from virtualization.models import * diff --git a/netbox/virtualization/forms/filtersets.py b/netbox/virtualization/forms/filtersets.py index 5f587153a..3e228742c 100644 --- a/netbox/virtualization/forms/filtersets.py +++ b/netbox/virtualization/forms/filtersets.py @@ -6,9 +6,8 @@ from extras.forms import LocalConfigContextFilterForm from ipam.models import L2VPN, VRF from netbox.forms import NetBoxModelFilterSetForm from tenancy.forms import ContactModelFilterForm, TenancyFilterForm -from utilities.forms import ( - DynamicModelMultipleChoiceField, TagFilterField, BOOLEAN_WITH_BLANK_CHOICES, -) +from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES +from utilities.forms.fields import DynamicModelMultipleChoiceField, TagFilterField from virtualization.choices import * from virtualization.models import * diff --git a/netbox/virtualization/forms/model_forms.py b/netbox/virtualization/forms/model_forms.py index 95a80e177..b4051dec2 100644 --- a/netbox/virtualization/forms/model_forms.py +++ b/netbox/virtualization/forms/model_forms.py @@ -8,9 +8,9 @@ from dcim.models import Device, DeviceRole, Platform, Rack, Region, Site, SiteGr from ipam.models import IPAddress, VLAN, VLANGroup, VRF from netbox.forms import NetBoxModelForm from tenancy.forms import TenancyForm -from utilities.forms import ( - BootstrapMixin, CommentField, ConfirmationForm, DynamicModelChoiceField, DynamicModelMultipleChoiceField, - JSONField, SlugField, +from utilities.forms import BootstrapMixin, ConfirmationForm +from utilities.forms.fields import ( + CommentField, DynamicModelChoiceField, DynamicModelMultipleChoiceField, JSONField, SlugField, ) from utilities.forms.widgets import HTMXSelect from virtualization.models import * diff --git a/netbox/virtualization/forms/object_create.py b/netbox/virtualization/forms/object_create.py index 2e0cc5db1..c36ce00ee 100644 --- a/netbox/virtualization/forms/object_create.py +++ b/netbox/virtualization/forms/object_create.py @@ -1,4 +1,4 @@ -from utilities.forms import ExpandableNameField +from utilities.forms.fields import ExpandableNameField from .model_forms import VMInterfaceForm __all__ = ( diff --git a/netbox/wireless/forms/bulk_edit.py b/netbox/wireless/forms/bulk_edit.py index 69613a8c6..4fec0b87f 100644 --- a/netbox/wireless/forms/bulk_edit.py +++ b/netbox/wireless/forms/bulk_edit.py @@ -5,7 +5,8 @@ from dcim.choices import LinkStatusChoices from ipam.models import VLAN from netbox.forms import NetBoxModelBulkEditForm from tenancy.models import Tenant -from utilities.forms import add_blank_choice, CommentField, DynamicModelChoiceField +from utilities.forms import add_blank_choice +from utilities.forms.fields import CommentField, DynamicModelChoiceField from wireless.choices import * from wireless.constants import SSID_MAX_LENGTH from wireless.models import * diff --git a/netbox/wireless/forms/bulk_import.py b/netbox/wireless/forms/bulk_import.py index 236ad9c1d..f29e24260 100644 --- a/netbox/wireless/forms/bulk_import.py +++ b/netbox/wireless/forms/bulk_import.py @@ -1,10 +1,11 @@ from django.utils.translation import gettext as _ + from dcim.choices import LinkStatusChoices from dcim.models import Interface from ipam.models import VLAN from netbox.forms import NetBoxModelImportForm from tenancy.models import Tenant -from utilities.forms import CSVChoiceField, CSVModelChoiceField, SlugField +from utilities.forms.fields import CSVChoiceField, CSVModelChoiceField, SlugField from wireless.choices import * from wireless.models import * diff --git a/netbox/wireless/forms/filtersets.py b/netbox/wireless/forms/filtersets.py index 85caa6507..f281ed0db 100644 --- a/netbox/wireless/forms/filtersets.py +++ b/netbox/wireless/forms/filtersets.py @@ -4,7 +4,8 @@ from django.utils.translation import gettext as _ from dcim.choices import LinkStatusChoices from netbox.forms import NetBoxModelFilterSetForm from tenancy.forms import TenancyFilterForm -from utilities.forms import add_blank_choice, DynamicModelMultipleChoiceField, TagFilterField +from utilities.forms import add_blank_choice +from utilities.forms.fields import DynamicModelMultipleChoiceField, TagFilterField from wireless.choices import * from wireless.models import * diff --git a/netbox/wireless/forms/model_forms.py b/netbox/wireless/forms/model_forms.py index aff81232f..621b24b5c 100644 --- a/netbox/wireless/forms/model_forms.py +++ b/netbox/wireless/forms/model_forms.py @@ -1,9 +1,10 @@ from django.utils.translation import gettext as _ -from dcim.models import Device, Interface, Location, Region, Site, SiteGroup -from ipam.models import VLAN, VLANGroup + +from dcim.models import Device, Interface, Location, Site +from ipam.models import VLAN from netbox.forms import NetBoxModelForm from tenancy.forms import TenancyForm -from utilities.forms import CommentField, DynamicModelChoiceField, SlugField +from utilities.forms.fields import CommentField, DynamicModelChoiceField, SlugField from wireless.models import * __all__ = (