Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes: #17459 - Ensure help text on component create forms shows both bulk edit and substitution token instructions #17931

Merged
merged 7 commits into from
Nov 21, 2024
Merged

Fixes: #17459 - Ensure help text on component create forms shows both bulk edit and substitution token instructions #17931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ba7dbcf
Move {module} substitution help text to main ComponentCreateForm.__in…
bctiemann Nov 4, 2024
d6bde32
Simplify help text replacement string for component forms with 'modul…
bctiemann Nov 8, 2024
37b5413
Reuse help text string in both ComponentCreateForm and ModularCompone…
bctiemann Nov 15, 2024
1fb79c2
Merge branch 'develop' into 17459-fix-component-help-text
bctiemann Nov 20, 2024
d0b7135
Remove help text override from regular (direct) object creation of de…
bctiemann Nov 21, 2024
663b7f8
Re-add space
bctiemann Nov 21, 2024
8ee1440
Tweak help text
jeremystretch Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions netbox/dcim/forms/model_forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,6 +909,13 @@ def __init__(self, *args, **kwargs):
if self.instance.pk:
self.fields['module_type'].disabled = True

# Components attached to a module need to present this standardized substitution 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: <code>[ge,xe]-0/0/[0-9]</code>). The token <code>{module}</code>, if present, will be "
"automatically replaced with the position value when creating a new module."
)


class ConsolePortTemplateForm(ModularComponentTemplateForm):
fieldsets = (
Expand Down
8 changes: 0 additions & 8 deletions netbox/dcim/forms/object_create.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,14 +243,6 @@ class InterfaceCreateForm(ComponentCreateForm, model_forms.InterfaceForm):
class Meta(model_forms.InterfaceForm.Meta):
exclude = ('name', 'label')

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)

if 'module' in self.fields:
self.fields['name'].help_text += _(
"The string <code>{module}</code> will be replaced with the position of the assigned module, if any."
)


class FrontPortCreateForm(ComponentCreateForm, model_forms.FrontPortForm):
device = DynamicModelChoiceField(
Expand Down
Loading