- | Outside NAT IPs |
+ NAT (Outside) |
{% for ip in object.nat_outside.all %}
- {{ ip|linkify }}
+ {{ ip|linkify }}
+ {% if ip.assigned_object %}
+ ({{ ip.assigned_object.parent_object|linkify }})
+ {% endif %}
{% empty %}
{{ ''|placeholder }}
{% endfor %}
diff --git a/netbox/templates/ipam/l2vpn.html b/netbox/templates/ipam/l2vpn.html
index 44a1da818..c19363d33 100644
--- a/netbox/templates/ipam/l2vpn.html
+++ b/netbox/templates/ipam/l2vpn.html
@@ -59,7 +59,7 @@
{% if perms.ipam.add_l2vpntermination %}
diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html
index f62da6fed..5756d939a 100644
--- a/netbox/templates/virtualization/virtualmachine.html
+++ b/netbox/templates/virtualization/virtualmachine.html
@@ -45,8 +45,8 @@
{{ object.primary_ip4.address.ip }}
{% if object.primary_ip4.nat_inside %}
(NAT for {{ object.primary_ip4.nat_inside.address.ip }})
- {% elif object.primary_ip4.nat_outside %}
- (NAT: {{ object.primary_ip4.nat_outside.address.ip }})
+ {% elif object.primary_ip4.nat_outside.exists %}
+ (NAT for {% for nat in object.primary_ip4.nat_outside.all %}{{ nat.address.ip }}{% if not forloop.last %}, {% endif %}{% endfor %})
{% endif %}
{% else %}
{{ ''|placeholder }}
@@ -60,8 +60,8 @@
{{ object.primary_ip6.address.ip }}
{% if object.primary_ip6.nat_inside %}
(NAT for {{ object.primary_ip6.nat_inside.address.ip }})
- {% elif object.primary_ip6.nat_outside %}
- (NAT: {{ object.primary_ip6.nat_outside.address.ip }})
+ {% elif object.primary_ip6.nat_outside.exists %}
+ (NAT for {% for nat in object.primary_ip6.nat_outside.all %}{{ nat.address.ip }}{% if not forloop.last %}, {% endif %}{% endfor %})
{% endif %}
{% else %}
{{ ''|placeholder }}
diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py
index 9a2fe6ab9..e582c15d1 100644
--- a/netbox/tenancy/views.py
+++ b/netbox/tenancy/views.py
@@ -1,4 +1,5 @@
from django.contrib.contenttypes.models import ContentType
+from django.http import QueryDict
from django.shortcuts import get_object_or_404
from circuits.models import Circuit
@@ -365,6 +366,12 @@ class ContactAssignmentEditView(generic.ObjectEditView):
instance.object = get_object_or_404(content_type.model_class(), pk=request.GET.get('object_id'))
return instance
+ def get_extra_addanother_params(self, request):
+ return {
+ 'content_type': request.GET.get('content_type'),
+ 'object_id': request.GET.get('object_id'),
+ }
+
class ContactAssignmentDeleteView(generic.ObjectDeleteView):
queryset = ContactAssignment.objects.all()
diff --git a/netbox/users/tests/test_api.py b/netbox/users/tests/test_api.py
index bcfc9cf14..a0bf8a49e 100644
--- a/netbox/users/tests/test_api.py
+++ b/netbox/users/tests/test_api.py
@@ -124,7 +124,7 @@ class TokenTest(
user = User.objects.create_user(**data)
url = reverse('users-api:token_provision')
- response = self.client.post(url, **self.header, data=data)
+ response = self.client.post(url, data, format='json', **self.header)
self.assertEqual(response.status_code, 201)
self.assertIn('key', response.data)
self.assertEqual(len(response.data['key']), 40)
@@ -141,7 +141,7 @@ class TokenTest(
}
url = reverse('users-api:token_provision')
- response = self.client.post(url, **self.header, data=data)
+ response = self.client.post(url, data, format='json', **self.header)
self.assertEqual(response.status_code, 403)
diff --git a/netbox/utilities/templatetags/builtins/filters.py b/netbox/utilities/templatetags/builtins/filters.py
index bc395e438..6b548a89d 100644
--- a/netbox/utilities/templatetags/builtins/filters.py
+++ b/netbox/utilities/templatetags/builtins/filters.py
@@ -5,7 +5,7 @@ import re
import yaml
from django import template
from django.contrib.contenttypes.models import ContentType
-from django.utils.html import strip_tags
+from django.utils.html import escape
from django.utils.safestring import mark_safe
from markdown import markdown
@@ -35,7 +35,7 @@ def linkify(instance, attr=None):
text = getattr(instance, attr) if attr is not None else str(instance)
try:
url = instance.get_absolute_url()
- return mark_safe(f'{text}')
+ return mark_safe(f'{escape(text)}')
except (AttributeError, TypeError):
return text
diff --git a/netbox/utilities/utils.py b/netbox/utilities/utils.py
index 1dece76c8..69ab615fc 100644
--- a/netbox/utilities/utils.py
+++ b/netbox/utilities/utils.py
@@ -285,7 +285,7 @@ def prepare_cloned_fields(instance):
"""
# Generate the clone attributes from the instance
if not hasattr(instance, 'clone'):
- return QueryDict()
+ return QueryDict(mutable=True)
attrs = instance.clone()
# Prepare querydict parameters
diff --git a/netbox/virtualization/models.py b/netbox/virtualization/models.py
index 21bc799be..b8131c1ce 100644
--- a/netbox/virtualization/models.py
+++ b/netbox/virtualization/models.py
@@ -167,6 +167,10 @@ class Cluster(NetBoxModel):
def __str__(self):
return self.name
+ @classmethod
+ def get_prerequisite_models(cls):
+ return [ClusterType, ]
+
def get_absolute_url(self):
return reverse('virtualization:cluster', args=[self.pk])
@@ -312,6 +316,10 @@ class VirtualMachine(NetBoxModel, ConfigContextModel):
def __str__(self):
return self.name
+ @classmethod
+ def get_prerequisite_models(cls):
+ return [Cluster, ]
+
def get_absolute_url(self):
return reverse('virtualization:virtualmachine', args=[self.pk])
diff --git a/netbox/wireless/migrations/0005_wirelesslink_interface_types.py b/netbox/wireless/migrations/0005_wirelesslink_interface_types.py
new file mode 100644
index 000000000..0b3f88c5b
--- /dev/null
+++ b/netbox/wireless/migrations/0005_wirelesslink_interface_types.py
@@ -0,0 +1,24 @@
+from django.db import migrations, models
+import django.db.models.deletion
+import wireless.models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('dcim', '0161_cabling_cleanup'),
+ ('wireless', '0004_wireless_tenancy'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='wirelesslink',
+ name='interface_a',
+ field=models.ForeignKey(limit_choices_to=wireless.models.get_wireless_interface_types, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='dcim.interface'),
+ ),
+ migrations.AlterField(
+ model_name='wirelesslink',
+ name='interface_b',
+ field=models.ForeignKey(limit_choices_to=wireless.models.get_wireless_interface_types, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='dcim.interface'),
+ ),
+ ]
diff --git a/netbox/wireless/models.py b/netbox/wireless/models.py
index 0540e9c45..c383ad642 100644
--- a/netbox/wireless/models.py
+++ b/netbox/wireless/models.py
@@ -1,3 +1,4 @@
+from django.apps import apps
from django.core.exceptions import ValidationError
from django.db import models
from django.urls import reverse
@@ -23,7 +24,8 @@ class WirelessAuthenticationBase(models.Model):
auth_type = models.CharField(
max_length=50,
choices=WirelessAuthTypeChoices,
- blank=True
+ blank=True,
+ verbose_name="Auth Type",
)
auth_cipher = models.CharField(
max_length=50,
@@ -126,21 +128,29 @@ class WirelessLAN(WirelessAuthenticationBase, NetBoxModel):
return reverse('wireless:wirelesslan', args=[self.pk])
+def get_wireless_interface_types():
+ # Wrap choices in a callable to avoid generating dummy migrations
+ # when the choices are updated.
+ return {'type__in': WIRELESS_IFACE_TYPES}
+
+
class WirelessLink(WirelessAuthenticationBase, NetBoxModel):
"""
A point-to-point connection between two wireless Interfaces.
"""
interface_a = models.ForeignKey(
to='dcim.Interface',
- limit_choices_to={'type__in': WIRELESS_IFACE_TYPES},
+ limit_choices_to=get_wireless_interface_types,
on_delete=models.PROTECT,
- related_name='+'
+ related_name='+',
+ verbose_name="Interface A",
)
interface_b = models.ForeignKey(
to='dcim.Interface',
- limit_choices_to={'type__in': WIRELESS_IFACE_TYPES},
+ limit_choices_to=get_wireless_interface_types,
on_delete=models.PROTECT,
- related_name='+'
+ related_name='+',
+ verbose_name="Interface B",
)
ssid = models.CharField(
max_length=SSID_MAX_LENGTH,
@@ -190,6 +200,10 @@ class WirelessLink(WirelessAuthenticationBase, NetBoxModel):
def __str__(self):
return f'#{self.pk}'
+ @classmethod
+ def get_prerequisite_models(cls):
+ return [apps.get_model('dcim.Interface'), ]
+
def get_absolute_url(self):
return reverse('wireless:wirelesslink', args=[self.pk])
|