diff --git a/netbox/dcim/forms/common.py b/netbox/dcim/forms/common.py index b42d5d815..0889583cf 100644 --- a/netbox/dcim/forms/common.py +++ b/netbox/dcim/forms/common.py @@ -10,13 +10,6 @@ __all__ = ( 'ModuleCommonForm' ) -COMPONENT_BULK_CREATE_HELP_TEXT = ( - "Alphanumeric ranges are supported for bulk creation. Mixed cases and types " - "within a single range are not supported (example: [ge,xe]-0/0/[0-9]). The string " - "{module} will be replaced with the position of the assigned module, if any." -) - - class InterfaceCommonForm(forms.Form): mac_address = forms.CharField( empty_value=None, diff --git a/netbox/dcim/forms/model_forms.py b/netbox/dcim/forms/model_forms.py index 5ca5690dc..45593013c 100644 --- a/netbox/dcim/forms/model_forms.py +++ b/netbox/dcim/forms/model_forms.py @@ -19,7 +19,7 @@ from utilities.forms.rendering import FieldSet, InlineFields, TabbedGroups from utilities.forms.widgets import APISelect, ClearableFileInput, HTMXSelect, NumberWithOptions, SelectWithPK from virtualization.models import Cluster from wireless.models import WirelessLAN, WirelessLANGroup -from .common import COMPONENT_BULK_CREATE_HELP_TEXT, InterfaceCommonForm, ModuleCommonForm +from .common import InterfaceCommonForm, ModuleCommonForm __all__ = ( 'CableForm', @@ -910,7 +910,11 @@ class ModularComponentTemplateForm(ComponentTemplateForm): self.fields['module_type'].disabled = True # Components attached to a module need to present this standardized substitution help text. - self.fields['name'].help_text = _(COMPONENT_BULK_CREATE_HELP_TEXT) + self.fields['name'].help_text = _( + "Alphanumeric ranges are supported for bulk creation. Mixed cases and types " + "within a single range are not supported (example: [ge,xe]-0/0/[0-9]). The string " + "{module} will be replaced with the position of the assigned module, if any." + ) class ConsolePortTemplateForm(ModularComponentTemplateForm): diff --git a/netbox/dcim/forms/object_create.py b/netbox/dcim/forms/object_create.py index 9222e5c90..85c613b8c 100644 --- a/netbox/dcim/forms/object_create.py +++ b/netbox/dcim/forms/object_create.py @@ -7,7 +7,6 @@ from utilities.forms.fields import DynamicModelChoiceField, DynamicModelMultiple from utilities.forms.rendering import FieldSet from utilities.forms.widgets import APISelect from . import model_forms -from .common import COMPONENT_BULK_CREATE_HELP_TEXT __all__ = ( 'ComponentCreateForm', @@ -53,13 +52,6 @@ class ComponentCreateForm(forms.Form): # ComponentCreateView when creating objects. replication_fields = ('name', 'label') - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - # Components attached to a module need to present this standardized substitution help text. - if 'module' in self.fields: - self.fields['name'].help_text = _(COMPONENT_BULK_CREATE_HELP_TEXT) - def clean(self): super().clean()