{% if changelog and perms.extras.view_objectchange %}
diff --git a/netbox/templates/ipam/aggregate.html b/netbox/templates/ipam/aggregate.html
index c34380722..43cfb10a0 100644
--- a/netbox/templates/ipam/aggregate.html
+++ b/netbox/templates/ipam/aggregate.html
@@ -48,7 +48,7 @@
{% if perms.extras.view_objectchange %}
- Changelog
+ Change Log
{% endif %}
diff --git a/netbox/templates/ipam/inc/service.html b/netbox/templates/ipam/inc/service.html
index 6a3a23bde..9611be175 100644
--- a/netbox/templates/ipam/inc/service.html
+++ b/netbox/templates/ipam/inc/service.html
@@ -14,7 +14,7 @@
{{ service.description }}
-
+
{% if perms.ipam.change_service %}
diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html
index 167d3fddf..83c34cd6b 100644
--- a/netbox/templates/ipam/ipaddress.html
+++ b/netbox/templates/ipam/ipaddress.html
@@ -49,7 +49,7 @@
{% if perms.extras.view_objectchange %}
- Changelog
+ Change Log
{% endif %}
diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html
index f14cab259..5d5490937 100644
--- a/netbox/templates/ipam/prefix.html
+++ b/netbox/templates/ipam/prefix.html
@@ -69,7 +69,7 @@
{% endif %}
{% if perms.extras.view_objectchange %}
- Changelog
+ Change Log
{% endif %}
diff --git a/netbox/templates/ipam/vlan.html b/netbox/templates/ipam/vlan.html
index 50b964992..246f3c866 100644
--- a/netbox/templates/ipam/vlan.html
+++ b/netbox/templates/ipam/vlan.html
@@ -55,7 +55,7 @@
{% if perms.extras.view_objectchange %}
- Changelog
+ Change Log
{% endif %}
diff --git a/netbox/templates/ipam/vrf.html b/netbox/templates/ipam/vrf.html
index 242cfde92..7bb2dea25 100644
--- a/netbox/templates/ipam/vrf.html
+++ b/netbox/templates/ipam/vrf.html
@@ -46,7 +46,7 @@
{% if perms.extras.view_objectchange %}
- Changelog
+ Change Log
{% endif %}
diff --git a/netbox/templates/secrets/secret.html b/netbox/templates/secrets/secret.html
index 438a5a943..6045897c9 100644
--- a/netbox/templates/secrets/secret.html
+++ b/netbox/templates/secrets/secret.html
@@ -34,7 +34,7 @@
{% if perms.extras.view_objectchange %}
- Changelog
+ Change Log
{% endif %}
diff --git a/netbox/templates/tenancy/tenant.html b/netbox/templates/tenancy/tenant.html
index 71c063502..9a1ed1be8 100644
--- a/netbox/templates/tenancy/tenant.html
+++ b/netbox/templates/tenancy/tenant.html
@@ -49,7 +49,7 @@
{% if perms.extras.view_objectchange %}
- Changelog
+ Change Log
{% endif %}
diff --git a/netbox/templates/virtualization/cluster.html b/netbox/templates/virtualization/cluster.html
index 6b90a660d..92540fd70 100644
--- a/netbox/templates/virtualization/cluster.html
+++ b/netbox/templates/virtualization/cluster.html
@@ -49,7 +49,7 @@
{% if perms.extras.view_objectchange %}
- Changelog
+ Change Log
{% endif %}
diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html
index 10c1f36d4..8f3bb61d4 100644
--- a/netbox/templates/virtualization/virtualmachine.html
+++ b/netbox/templates/virtualization/virtualmachine.html
@@ -54,7 +54,7 @@
{% endif %}
{% if perms.extras.view_objectchange %}
- Changelog
+ Change Log
{% endif %}
diff --git a/netbox/tenancy/tables.py b/netbox/tenancy/tables.py
index 884bdc3df..af4fb34c0 100644
--- a/netbox/tenancy/tables.py
+++ b/netbox/tenancy/tables.py
@@ -4,7 +4,7 @@ from utilities.tables import BaseTable, ToggleColumn
from .models import Tenant, TenantGroup
TENANTGROUP_ACTIONS = """
-
+
{% if perms.tenancy.change_tenantgroup %}
diff --git a/netbox/utilities/fields.py b/netbox/utilities/fields.py
index 6181a7ca1..4eb19f539 100644
--- a/netbox/utilities/fields.py
+++ b/netbox/utilities/fields.py
@@ -56,8 +56,11 @@ class NaturalOrderingField(models.CharField):
"""
Generate a naturalized value from the target field
"""
- value = getattr(model_instance, self.target_field)
- return self.naturalize_function(value, max_length=self.max_length)
+ original_value = getattr(model_instance, self.target_field)
+ naturalized_value = self.naturalize_function(original_value, max_length=self.max_length)
+ setattr(model_instance, self.attname, naturalized_value)
+
+ return naturalized_value
def deconstruct(self):
kwargs = super().deconstruct()[3] # Pass kwargs from CharField
diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py
index c629d70a2..a7ee63eaa 100644
--- a/netbox/utilities/forms.py
+++ b/netbox/utilities/forms.py
@@ -132,6 +132,13 @@ class SmallTextarea(forms.Textarea):
pass
+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 .
@@ -534,7 +541,8 @@ class SlugField(forms.SlugField):
def __init__(self, slug_source='name', *args, **kwargs):
label = kwargs.pop('label', "Slug")
help_text = kwargs.pop('help_text', "URL-friendly unique shorthand")
- super().__init__(label=label, help_text=help_text, *args, **kwargs)
+ widget = kwargs.pop('widget', SlugWidget)
+ super().__init__(label=label, help_text=help_text, widget=widget, *args, **kwargs)
self.widget.attrs['slug-source'] = slug_source
diff --git a/netbox/utilities/ordering.py b/netbox/utilities/ordering.py
index 39e21733a..346a99488 100644
--- a/netbox/utilities/ordering.py
+++ b/netbox/utilities/ordering.py
@@ -7,7 +7,8 @@ INTERFACE_NAME_REGEX = r'(^(?P[^\d\.:]+)?)' \
r'((?P\d+)/)?' \
r'((?P\d+))?' \
r'(:(?P\d+))?' \
- r'(.(?P\d+)$)?'
+ r'(\.(?P\d+))?' \
+ r'(?P.*)$'
def naturalize(value, max_length, integer_places=8):
@@ -50,7 +51,7 @@ def naturalize_interface(value, max_length):
:param value: The value to be naturalized
:param max_length: The maximum length of the returned string. Characters beyond this length will be stripped.
"""
- output = []
+ output = ''
match = re.search(INTERFACE_NAME_REGEX, value)
if match is None:
return value
@@ -60,21 +61,25 @@ def naturalize_interface(value, max_length):
for part_name in ('slot', 'subslot', 'position', 'subposition'):
part = match.group(part_name)
if part is not None:
- output.append(part.rjust(4, '0'))
+ output += part.rjust(4, '0')
else:
- output.append('9999')
+ output += '9999'
# Append the type, if any.
if match.group('type') is not None:
- output.append(match.group('type'))
+ output += match.group('type')
- # Finally, append any remaining fields, left-padding to six digits each.
+ # Append any remaining fields, left-padding to six digits each.
for part_name in ('id', 'channel', 'vc'):
part = match.group(part_name)
if part is not None:
- output.append(part.rjust(6, '0'))
+ output += part.rjust(6, '0')
else:
- output.append('000000')
+ output += '000000'
- ret = ''.join(output)
- return ret[:max_length]
+ # Finally, naturalize any remaining text and append it
+ if match.group('remainder') is not None and len(output) < max_length:
+ remainder = naturalize(match.group('remainder'), max_length - len(output))
+ output += remainder
+
+ return output[:max_length]
diff --git a/netbox/utilities/templates/widgets/sluginput.html b/netbox/utilities/templates/widgets/sluginput.html
new file mode 100644
index 000000000..76de7f35a
--- /dev/null
+++ b/netbox/utilities/templates/widgets/sluginput.html
@@ -0,0 +1,8 @@
+
+ {% include "django/forms/widgets/input.html" %}
+
+
+
+
+
diff --git a/netbox/utilities/tests/test_ordering.py b/netbox/utilities/tests/test_ordering.py
index 958224c94..30692f46a 100644
--- a/netbox/utilities/tests/test_ordering.py
+++ b/netbox/utilities/tests/test_ordering.py
@@ -9,8 +9,8 @@ class NaturalizationTestCase(TestCase):
"""
def test_naturalize(self):
+ # Original, naturalized
data = (
- # Original, naturalized
('abc', 'abc'),
('123', '00000123'),
('abc123', 'abc00000123'),
@@ -21,15 +21,16 @@ class NaturalizationTestCase(TestCase):
)
for origin, naturalized in data:
- self.assertEqual(naturalize(origin, max_length=50), naturalized)
+ self.assertEqual(naturalize(origin, max_length=100), naturalized)
def test_naturalize_max_length(self):
self.assertEqual(naturalize('abc123def456', max_length=10), 'abc0000012')
def test_naturalize_interface(self):
+ # Original, naturalized
data = (
- # Original, naturalized
+ # IOS/JunOS-style
('Gi', '9999999999999999Gi000000000000000000'),
('Gi1', '9999999999999999Gi000001000000000000'),
('Gi1/2', '0001999999999999Gi000002000000000000'),
@@ -40,10 +41,16 @@ class NaturalizationTestCase(TestCase):
('Gi1/2/3/4/5:6.7', '0001000200030004Gi000005000006000007'),
('Gi1:2', '9999999999999999Gi000001000002000000'),
('Gi1:2.3', '9999999999999999Gi000001000002000003'),
+ # Generic
+ ('Interface 1', '9999999999999999Interface 000001000000000000'),
+ ('Interface 1 (other)', '9999999999999999Interface 000001000000000000 (other)'),
+ ('Interface 99', '9999999999999999Interface 000099000000000000'),
+ ('PCIe1-p1', '9999999999999999PCIe000001000000000000-p00000001'),
+ ('PCIe1-p99', '9999999999999999PCIe000001000000000000-p00000099'),
)
for origin, naturalized in data:
- self.assertEqual(naturalize_interface(origin, max_length=50), naturalized)
+ self.assertEqual(naturalize_interface(origin, max_length=100), naturalized)
def test_naturalize_interface_max_length(self):
self.assertEqual(naturalize_interface('Gi1/2/3', max_length=20), '0001000299999999Gi00')
diff --git a/netbox/utilities/utils.py b/netbox/utilities/utils.py
index 979f95af9..6969a60e9 100644
--- a/netbox/utilities/utils.py
+++ b/netbox/utilities/utils.py
@@ -222,3 +222,19 @@ def querydict_to_dict(querydict):
key: querydict.get(key) if len(value) == 1 and key != 'pk' else querydict.getlist(key)
for key, value in querydict.lists()
}
+
+
+def shallow_compare_dict(source_dict, destination_dict, exclude=None):
+ """
+ Return a new dictionary of the different keys. The values of `destination_dict` are returned. Only the equality of
+ the first layer of keys/values is checked. `exclude` is a list or tuple of keys to be ignored.
+ """
+ difference = {}
+
+ for key in destination_dict:
+ if source_dict.get(key) != destination_dict[key]:
+ if isinstance(exclude, (list, tuple)) and key in exclude:
+ continue
+ difference[key] = destination_dict[key]
+
+ return difference
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index d0257324e..19a6d655e 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -656,9 +656,8 @@ class BulkEditView(GetReturnURLMixin, View):
try:
model_field = model._meta.get_field(name)
except FieldDoesNotExist:
- # The form field is used to modify a field rather than set its value directly,
- # so we skip it.
- continue
+ # This form field is used to modify a field rather than set its value directly
+ model_field = None
# Handle nullification
if name in form.nullable_fields and name in nullified_fields:
diff --git a/netbox/virtualization/tables.py b/netbox/virtualization/tables.py
index ba4554ff5..fdb997dab 100644
--- a/netbox/virtualization/tables.py
+++ b/netbox/virtualization/tables.py
@@ -7,7 +7,7 @@ from utilities.tables import BaseTable, ToggleColumn
from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine
CLUSTERTYPE_ACTIONS = """
-
+
{% if perms.virtualization.change_clustertype %}
@@ -16,7 +16,7 @@ CLUSTERTYPE_ACTIONS = """
"""
CLUSTERGROUP_ACTIONS = """
-
+
{% if perms.virtualization.change_clustergroup %}