{% if peer.rf_channel_width %}
- {{ peer.rf_channel_width|simplify_decimal }} MHz
+ {{ peer.rf_channel_width|floatformat:"-3" }} MHz
{% else %}
{{ ''|placeholder }}
{% endif %}
diff --git a/netbox/templates/wireless/inc/wirelesslink_interface.html b/netbox/templates/wireless/inc/wirelesslink_interface.html
index 7732816a7..b2ad55adf 100644
--- a/netbox/templates/wireless/inc/wirelesslink_interface.html
+++ b/netbox/templates/wireless/inc/wirelesslink_interface.html
@@ -31,7 +31,7 @@
| Channel Frequency |
{% if interface.rf_channel_frequency %}
- {{ interface.rf_channel_frequency|simplify_decimal }} MHz
+ {{ interface.rf_channel_frequency|floatformat:"-2" }} MHz
{% else %}
{{ ''|placeholder }}
{% endif %}
@@ -41,7 +41,7 @@
| Channel Width |
{% if interface.rf_channel_width %}
- {{ interface.rf_channel_width|simplify_decimal }} MHz
+ {{ interface.rf_channel_width|floatformat:"-3" }} MHz
{% else %}
{{ ''|placeholder }}
{% endif %}
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/api.py b/netbox/utilities/api.py
index e3fc3c8d4..50bb033e4 100644
--- a/netbox/utilities/api.py
+++ b/netbox/utilities/api.py
@@ -10,6 +10,14 @@ from rest_framework.utils import formatting
from netbox.api.exceptions import GraphQLTypeNotFound, SerializerNotFound
from .utils import dynamic_import
+__all__ = (
+ 'get_graphql_type_for_model',
+ 'get_serializer_for_model',
+ 'get_view_name',
+ 'is_api_request',
+ 'rest_api_server_error',
+)
+
def get_serializer_for_model(model, prefix=''):
"""
diff --git a/netbox/utilities/constants.py b/netbox/utilities/constants.py
index 096b60a70..366d8f796 100644
--- a/netbox/utilities/constants.py
+++ b/netbox/utilities/constants.py
@@ -31,21 +31,6 @@ FILTER_TREENODE_NEGATION_LOOKUP_MAP = dict(
n='in'
)
-
-# Keys for PostgreSQL advisory locks. These are arbitrary bigints used by
-# the advisory_lock contextmanager. When a lock is acquired,
-# one of these keys will be used to identify said lock.
-#
-# When adding a new key, pick something arbitrary and unique so
-# that it is easily searchable in query logs.
-
-ADVISORY_LOCK_KEYS = {
- 'available-prefixes': 100100,
- 'available-ips': 100200,
- 'available-vlans': 100300,
- 'available-asns': 100400,
-}
-
#
# HTTP Request META safe copy
#
diff --git a/netbox/utilities/exceptions.py b/netbox/utilities/exceptions.py
index d7418d0cb..512bb4b60 100644
--- a/netbox/utilities/exceptions.py
+++ b/netbox/utilities/exceptions.py
@@ -3,6 +3,7 @@ from rest_framework.exceptions import APIException
__all__ = (
'AbortRequest',
+ 'AbortScript',
'AbortTransaction',
'PermissionsViolation',
'RQWorkerNotRunningException',
diff --git a/netbox/utilities/fields.py b/netbox/utilities/fields.py
index b2bc4d2cd..8934e4ad6 100644
--- a/netbox/utilities/fields.py
+++ b/netbox/utilities/fields.py
@@ -1,21 +1,23 @@
from collections import defaultdict
from django.contrib.contenttypes.fields import GenericForeignKey
-from django.core.validators import RegexValidator
from django.db import models
from utilities.ordering import naturalize
-from .forms import ColorSelect
+from .forms.widgets import ColorSelect
+from .validators import ColorValidator
-ColorValidator = RegexValidator(
- regex='^[0-9a-f]{6}$',
- message='Enter a valid hexadecimal RGB color code.',
- code='invalid'
+__all__ = (
+ 'ColorField',
+ 'NaturalOrderingField',
+ 'NullableCharField',
+ 'RestrictedGenericForeignKey',
)
# Deprecated: Retained only to ensure successful migration from early releases
# Use models.CharField(null=True) instead
+# TODO: Remove in v4.0
class NullableCharField(models.CharField):
description = "Stores empty values as NULL rather than ''"
diff --git a/netbox/utilities/files.py b/netbox/utilities/files.py
index 68afe2962..09ed2c90b 100644
--- a/netbox/utilities/files.py
+++ b/netbox/utilities/files.py
@@ -1,5 +1,9 @@
import hashlib
+__all__ = (
+ 'sha256_hash',
+)
+
def sha256_hash(filepath):
"""
diff --git a/netbox/utilities/filters.py b/netbox/utilities/filters.py
index cfe21063b..1bf17beae 100644
--- a/netbox/utilities/filters.py
+++ b/netbox/utilities/filters.py
@@ -6,6 +6,22 @@ from django_filters.constants import EMPTY_VALUES
from drf_spectacular.utils import extend_schema_field
from drf_spectacular.types import OpenApiTypes
+__all__ = (
+ 'ContentTypeFilter',
+ 'MACAddressFilter',
+ 'MultiValueCharFilter',
+ 'MultiValueDateFilter',
+ 'MultiValueDateTimeFilter',
+ 'MultiValueDecimalFilter',
+ 'MultiValueMACAddressFilter',
+ 'MultiValueNumberFilter',
+ 'MultiValueTimeFilter',
+ 'MultiValueWWNFilter',
+ 'NullableCharFieldFilter',
+ 'NumericArrayFilter',
+ 'TreeNodeMultipleChoiceFilter',
+)
+
def multivalue_field_factory(field_class):
"""
diff --git a/netbox/utilities/forms/__init__.py b/netbox/utilities/forms/__init__.py
index ce958a99e..94f7d48c9 100644
--- a/netbox/utilities/forms/__init__.py
+++ b/netbox/utilities/forms/__init__.py
@@ -1,5 +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/fields/array.py b/netbox/utilities/forms/fields/array.py
new file mode 100644
index 000000000..6e1a40988
--- /dev/null
+++ b/netbox/utilities/forms/fields/array.py
@@ -0,0 +1,24 @@
+from django import forms
+from django.contrib.postgres.forms import SimpleArrayField
+
+from ..utils import parse_numeric_range
+
+__all__ = (
+ 'NumericArrayField',
+)
+
+
+class NumericArrayField(SimpleArrayField):
+
+ def clean(self, value):
+ if value and not self.to_python(value):
+ raise forms.ValidationError(f'Invalid list ({value}). '
+ f'Must be numeric and ranges must be in ascending order')
+ return super().clean(value)
+
+ def to_python(self, value):
+ if not value:
+ return []
+ if isinstance(value, str):
+ value = ','.join([str(n) for n in parse_numeric_range(value)])
+ return super().to_python(value)
diff --git a/netbox/utilities/forms/fields/content_types.py b/netbox/utilities/forms/fields/content_types.py
index 76efe9a7b..0223ab05a 100644
--- a/netbox/utilities/forms/fields/content_types.py
+++ b/netbox/utilities/forms/fields/content_types.py
@@ -1,6 +1,5 @@
from django import forms
-from utilities.forms import widgets
from utilities.utils import content_type_name
__all__ = (
diff --git a/netbox/utilities/forms/fields/csv.py b/netbox/utilities/forms/fields/csv.py
index f89f5f2ef..5d6258193 100644
--- a/netbox/utilities/forms/fields/csv.py
+++ b/netbox/utilities/forms/fields/csv.py
@@ -1,14 +1,9 @@
-import csv
-from io import StringIO
-
from django import forms
from django.contrib.contenttypes.models import ContentType
from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist
from django.db.models import Q
-from django.utils.translation import gettext as _
from utilities.choices import unpack_grouped_choices
-from utilities.forms.utils import parse_csv, validate_csv
from utilities.utils import content_type_identifier
__all__ = (
diff --git a/netbox/utilities/forms/forms.py b/netbox/utilities/forms/forms.py
index b06fb2e48..9f84e100f 100644
--- a/netbox/utilities/forms/forms.py
+++ b/netbox/utilities/forms/forms.py
@@ -2,96 +2,31 @@ import re
from django import forms
from django.utils.translation import gettext as _
-
-from .widgets import APISelect, APISelectMultiple, ClearableFileInput
+from .mixins import BootstrapMixin
__all__ = (
- 'BootstrapMixin',
'BulkEditForm',
'BulkRenameForm',
'ConfirmationForm',
'CSVModelForm',
'FilterForm',
- 'ReturnURLForm',
'TableConfigForm',
)
-#
-# Mixins
-#
-
-class BootstrapMixin:
+class ConfirmationForm(BootstrapMixin, forms.Form):
"""
- Add the base Bootstrap CSS classes to form elements.
+ A generic confirmation form. The form is not valid unless the `confirm` field is checked.
"""
-
- def __init__(self, *args, **kwargs):
- super().__init__(*args, **kwargs)
-
- exempt_widgets = [
- forms.FileInput,
- forms.RadioSelect,
- APISelect,
- APISelectMultiple,
- ClearableFileInput,
- ]
-
- for field_name, field in self.fields.items():
- css = field.widget.attrs.get('class', '')
-
- if field.widget.__class__ in exempt_widgets:
- continue
-
- elif isinstance(field.widget, forms.CheckboxInput):
- field.widget.attrs['class'] = f'{css} form-check-input'
-
- elif isinstance(field.widget, forms.SelectMultiple):
- if 'size' not in field.widget.attrs:
- field.widget.attrs['class'] = f'{css} netbox-static-select'
-
- elif isinstance(field.widget, forms.Select):
- field.widget.attrs['class'] = f'{css} netbox-static-select'
-
- else:
- field.widget.attrs['class'] = f'{css} form-control'
-
- if field.required and not isinstance(field.widget, forms.FileInput):
- field.widget.attrs['required'] = 'required'
-
- if 'placeholder' not in field.widget.attrs and field.label is not None:
- field.widget.attrs['placeholder'] = field.label
-
- def is_valid(self):
- is_valid = super().is_valid()
-
- # Apply is-invalid CSS class to fields with errors
- if not is_valid:
- for field_name in self.errors:
- # Ignore e.g. __all__
- if field := self.fields.get(field_name):
- css = field.widget.attrs.get('class', '')
- field.widget.attrs['class'] = f'{css} is-invalid'
-
- return is_valid
-
-
-#
-# Form classes
-#
-
-class ReturnURLForm(forms.Form):
- """
- Provides a hidden return URL field to control where the user is directed after the form is submitted.
- """
- return_url = forms.CharField(required=False, widget=forms.HiddenInput())
-
-
-class ConfirmationForm(BootstrapMixin, ReturnURLForm):
- """
- A generic confirmation form. The form is not valid unless the confirm field is checked.
- """
- confirm = forms.BooleanField(required=True, widget=forms.HiddenInput(), initial=True)
+ return_url = forms.CharField(
+ required=False,
+ widget=forms.HiddenInput()
+ )
+ confirm = forms.BooleanField(
+ required=True,
+ widget=forms.HiddenInput(),
+ initial=True
+ )
class BulkEditForm(BootstrapMixin, forms.Form):
diff --git a/netbox/utilities/forms/mixins.py b/netbox/utilities/forms/mixins.py
new file mode 100644
index 000000000..dc9c3eb80
--- /dev/null
+++ b/netbox/utilities/forms/mixins.py
@@ -0,0 +1,62 @@
+from django import forms
+
+from .widgets import APISelect, APISelectMultiple, ClearableFileInput
+
+__all__ = (
+ 'BootstrapMixin',
+)
+
+
+class BootstrapMixin:
+ """
+ Add the base Bootstrap CSS classes to form elements.
+ """
+
+ def __init__(self, *args, **kwargs):
+ super().__init__(*args, **kwargs)
+
+ exempt_widgets = [
+ forms.FileInput,
+ forms.RadioSelect,
+ APISelect,
+ APISelectMultiple,
+ ClearableFileInput,
+ ]
+
+ for field_name, field in self.fields.items():
+ css = field.widget.attrs.get('class', '')
+
+ if field.widget.__class__ in exempt_widgets:
+ continue
+
+ elif isinstance(field.widget, forms.CheckboxInput):
+ field.widget.attrs['class'] = f'{css} form-check-input'
+
+ elif isinstance(field.widget, forms.SelectMultiple):
+ if 'size' not in field.widget.attrs:
+ field.widget.attrs['class'] = f'{css} netbox-static-select'
+
+ elif isinstance(field.widget, forms.Select):
+ field.widget.attrs['class'] = f'{css} netbox-static-select'
+
+ else:
+ field.widget.attrs['class'] = f'{css} form-control'
+
+ if field.required and not isinstance(field.widget, forms.FileInput):
+ field.widget.attrs['required'] = 'required'
+
+ if 'placeholder' not in field.widget.attrs and field.label is not None:
+ field.widget.attrs['placeholder'] = field.label
+
+ def is_valid(self):
+ is_valid = super().is_valid()
+
+ # Apply is-invalid CSS class to fields with errors
+ if not is_valid:
+ for field_name in self.errors:
+ # Ignore e.g. __all__
+ if field := self.fields.get(field_name):
+ css = field.widget.attrs.get('class', '')
+ field.widget.attrs['class'] = f'{css} is-invalid'
+
+ return is_valid
diff --git a/netbox/utilities/forms/widgets/__init__.py b/netbox/utilities/forms/widgets/__init__.py
new file mode 100644
index 000000000..9bd9f4faa
--- /dev/null
+++ b/netbox/utilities/forms/widgets/__init__.py
@@ -0,0 +1,4 @@
+from .apiselect import *
+from .datetime import *
+from .misc import *
+from .select import *
diff --git a/netbox/utilities/forms/widgets.py b/netbox/utilities/forms/widgets/apiselect.py
similarity index 56%
rename from netbox/utilities/forms/widgets.py
rename to netbox/utilities/forms/widgets/apiselect.py
index 7b20d00c9..e4b02cb1d 100644
--- a/netbox/utilities/forms/widgets.py
+++ b/netbox/utilities/forms/widgets/apiselect.py
@@ -1,120 +1,14 @@
import json
-from typing import Dict, Sequence, List, Tuple, Union
+from typing import Dict, List, Tuple
from django import forms
from django.conf import settings
-from django.contrib.postgres.forms import SimpleArrayField
-
-from utilities.choices import ColorChoices
-from .utils import add_blank_choice, parse_numeric_range
__all__ = (
'APISelect',
'APISelectMultiple',
- 'BulkEditNullBooleanSelect',
- 'ClearableFileInput',
- 'ColorSelect',
- 'DatePicker',
- 'DateTimePicker',
- 'HTMXSelect',
- 'MarkdownWidget',
- 'NumericArrayField',
- 'SelectDurationWidget',
- 'SelectSpeedWidget',
- 'SelectWithPK',
- 'SlugWidget',
- 'TimePicker',
)
-JSONPrimitive = Union[str, bool, int, float, None]
-QueryParamValue = Union[JSONPrimitive, Sequence[JSONPrimitive]]
-QueryParam = Dict[str, QueryParamValue]
-ProcessedParams = Sequence[Dict[str, Sequence[JSONPrimitive]]]
-
-
-class SlugWidget(forms.TextInput):
- """
- Subclass TextInput and add a slug regeneration button next to the form field.
- """
- template_name = 'widgets/sluginput.html'
-
-
-class ColorSelect(forms.Select):
- """
- Extends the built-in Select widget to colorize each |