Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion netbox/project-static/dist/netbox.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions netbox/project-static/dist/netbox.js.map

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions netbox/project-static/src/buttons/reslug.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@ function slugify(slug: string, chars: number): string {
* For any slug fields, add event listeners to handle automatically generating slug values.
*/
export function initReslug(): void {
for (const slugButton of getElements<HTMLButtonElement>('button#reslug')) {
for (const slugButton of getElements<HTMLButtonElement>('button.reslug')) {
const form = slugButton.form;
if (form == null) continue;
const slugField = form.querySelector('#id_slug') as HTMLInputElement;

const slugField = form.querySelector('input.slug-field') as HTMLInputElement;
if (slugField == null) continue;

const sourceId = slugField.getAttribute('slug-source');
const sourceField = form.querySelector(`#id_${sourceId}`) as HTMLInputElement;

Expand Down
8 changes: 8 additions & 0 deletions netbox/utilities/forms/fields/fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,14 @@ def __init__(self, *, slug_source='name', label=label, help_text=help_text, **kw

self.widget.attrs['slug-source'] = slug_source

def get_bound_field(self, form, field_name):
if prefix := form.prefix:
slug_source = self.widget.attrs.get('slug-source')
if slug_source and not slug_source.startswith(f'{prefix}-'):
self.widget.attrs['slug-source'] = f"{prefix}-{slug_source}"

return super().get_bound_field(form, field_name)


class ColorField(forms.CharField):
"""
Expand Down
8 changes: 8 additions & 0 deletions netbox/utilities/forms/widgets/misc.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,14 @@ class SlugWidget(forms.TextInput):
"""
template_name = 'widgets/sluginput.html'

def __init__(self, attrs=None):
local_attrs = {} if attrs is None else attrs.copy()
if 'class' in local_attrs:
local_attrs['class'] = f"{local_attrs['class']} slug-field"
else:
local_attrs['class'] = 'slug-field'
super().__init__(local_attrs)


class ArrayWidget(forms.Textarea):
"""
Expand Down
2 changes: 1 addition & 1 deletion netbox/utilities/templates/form_helpers/render_field.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
{% if field|widget_type == 'slugwidget' %}
<div class="input-group">
{{ field }}
<button id="reslug" type="button" title="{% trans "Regenerate Slug" %}" class="btn">
<button type="button" title="{% trans "Regenerate Slug" %}" class="btn reslug">
<i class="mdi mdi-reload"></i>
</button>
</div>
Expand Down