+ {% render_field form.region %}
{% render_field form.site %}
{% render_field form.rack_group %}
{% render_field form.rack %}
diff --git a/netbox/templates/dcim/virtualchassis_add.html b/netbox/templates/dcim/virtualchassis_add.html
index 07b17f378..ac94cc7df 100644
--- a/netbox/templates/dcim/virtualchassis_add.html
+++ b/netbox/templates/dcim/virtualchassis_add.html
@@ -13,6 +13,7 @@
Member Devices
+ {% render_field form.region %}
{% render_field form.site %}
{% render_field form.rack %}
{% render_field form.members %}
diff --git a/netbox/templates/ipam/ipaddress_edit.html b/netbox/templates/ipam/ipaddress_edit.html
index e7894dbad..92093dea4 100644
--- a/netbox/templates/ipam/ipaddress_edit.html
+++ b/netbox/templates/ipam/ipaddress_edit.html
@@ -62,6 +62,7 @@
+ {% render_field form.nat_region %}
{% render_field form.nat_site %}
{% render_field form.nat_rack %}
{% render_field form.nat_device %}
diff --git a/netbox/templates/ipam/prefix_edit.html b/netbox/templates/ipam/prefix_edit.html
index 401a53e38..126593074 100644
--- a/netbox/templates/ipam/prefix_edit.html
+++ b/netbox/templates/ipam/prefix_edit.html
@@ -16,6 +16,7 @@
Site/VLAN Assignment
+ {% render_field form.region %}
{% render_field form.site %}
{% render_field form.vlan_group %}
{% render_field form.vlan %}
diff --git a/netbox/templates/ipam/vlan_edit.html b/netbox/templates/ipam/vlan_edit.html
index 1c191343d..9ea3cdabb 100644
--- a/netbox/templates/ipam/vlan_edit.html
+++ b/netbox/templates/ipam/vlan_edit.html
@@ -8,12 +8,18 @@
{% render_field form.vid %}
{% render_field form.name %}
{% render_field form.status %}
- {% render_field form.site %}
- {% render_field form.group %}
{% render_field form.role %}
{% render_field form.description %}
+
+
Assignment
+
+ {% render_field form.region %}
+ {% render_field form.site %}
+ {% render_field form.group %}
+
+
Tenancy
diff --git a/netbox/templates/virtualization/cluster_edit.html b/netbox/templates/virtualization/cluster_edit.html
index c4d39d12e..5ad7c53e1 100644
--- a/netbox/templates/virtualization/cluster_edit.html
+++ b/netbox/templates/virtualization/cluster_edit.html
@@ -8,6 +8,7 @@
{% render_field form.name %}
{% render_field form.type %}
{% render_field form.group %}
+ {% render_field form.region %}
{% render_field form.site %}
diff --git a/netbox/templates/virtualization/vminterface.html b/netbox/templates/virtualization/vminterface.html
index 8d46b52fd..976812a44 100644
--- a/netbox/templates/virtualization/vminterface.html
+++ b/netbox/templates/virtualization/vminterface.html
@@ -1,5 +1,6 @@
{% extends 'base.html' %}
{% load helpers %}
+{% load plugins %}
{% block header %}
@@ -12,6 +13,7 @@
+ {% plugin_left_page vminterface %}
{% include 'extras/inc/tags_panel.html' with tags=vminterface.tags.all %}
+ {% plugin_right_page vminterface %}
@@ -97,4 +101,9 @@
{% include 'panel_table.html' with table=vlan_table heading="VLANs" %}
+
+
+ {% plugin_full_width_page vminterface %}
+
+
{% endblock %}
diff --git a/netbox/tenancy/forms.py b/netbox/tenancy/forms.py
index 142333bff..bceab7ce7 100644
--- a/netbox/tenancy/forms.py
+++ b/netbox/tenancy/forms.py
@@ -119,7 +119,10 @@ class TenancyForm(forms.Form):
tenant_group = DynamicModelChoiceField(
queryset=TenantGroup.objects.all(),
required=False,
- null_option='None'
+ null_option='None',
+ initial_params={
+ 'tenants': '$tenant'
+ }
)
tenant = DynamicModelChoiceField(
queryset=Tenant.objects.all(),
@@ -129,17 +132,6 @@ class TenancyForm(forms.Form):
}
)
- def __init__(self, *args, **kwargs):
-
- # Initialize helper selector
- instance = kwargs.get('instance')
- if instance and instance.tenant is not None:
- initial = kwargs.get('initial', {}).copy()
- initial['tenant_group'] = instance.tenant.group
- kwargs['initial'] = initial
-
- super().__init__(*args, **kwargs)
-
class TenancyFilterForm(forms.Form):
tenant_group = DynamicModelMultipleChoiceField(
diff --git a/netbox/utilities/filters.py b/netbox/utilities/filters.py
index f628ca917..18eeab7d2 100644
--- a/netbox/utilities/filters.py
+++ b/netbox/utilities/filters.py
@@ -68,11 +68,10 @@ class TreeNodeMultipleChoiceFilter(django_filters.ModelMultipleChoiceFilter):
"""
Filters for a set of Models, including all descendant models within a Tree. Example: [
,]
"""
-
def get_filter_predicate(self, v):
- # null value filtering
+ # Null value filtering
if v is None:
- return {self.field_name.replace('in', 'isnull'): True}
+ return {f"{self.field_name}__isnull": True}
return super().get_filter_predicate(v)
def filter(self, qs, value):
diff --git a/netbox/utilities/forms/fields.py b/netbox/utilities/forms/fields.py
index 6146e00d3..92e40e7bb 100644
--- a/netbox/utilities/forms/fields.py
+++ b/netbox/utilities/forms/fields.py
@@ -248,6 +248,7 @@ class DynamicModelChoiceMixin:
"""
:param display_field: The name of the attribute of an API response object to display in the selection list
:param query_params: A dictionary of additional key/value pairs to attach to the API request
+ :param initial_params: A dictionary of child field references to use for selecting a parent field's initial value
:param null_option: The string used to represent a null selection (if any)
:param disabled_indicator: The name of the field which, if populated, will disable selection of the
choice (optional)
@@ -256,10 +257,11 @@ class DynamicModelChoiceMixin:
filter = django_filters.ModelChoiceFilter
widget = widgets.APISelect
- def __init__(self, display_field='name', query_params=None, null_option=None, disabled_indicator=None,
- brief_mode=True, *args, **kwargs):
+ def __init__(self, display_field='name', query_params=None, initial_params=None, null_option=None,
+ disabled_indicator=None, brief_mode=True, *args, **kwargs):
self.display_field = display_field
self.query_params = query_params or {}
+ self.initial_params = initial_params or {}
self.null_option = null_option
self.disabled_indicator = disabled_indicator
self.brief_mode = brief_mode
@@ -300,6 +302,16 @@ class DynamicModelChoiceMixin:
def get_bound_field(self, form, field_name):
bound_field = BoundField(form, self, field_name)
+ # Set initial value based on prescribed child fields (if not already set)
+ if not self.initial and self.initial_params:
+ filter_kwargs = {}
+ for kwarg, child_field in self.initial_params.items():
+ value = form.initial.get(child_field.lstrip('$'))
+ if value:
+ filter_kwargs[kwarg] = value
+ if filter_kwargs:
+ self.initial = self.queryset.filter(**filter_kwargs).first()
+
# Modify the QuerySet of the field before we return it. Limit choices to any data already bound: Options
# will be populated on-demand via the APISelect widget.
data = bound_field.value()
diff --git a/netbox/utilities/middleware.py b/netbox/utilities/middleware.py
index d86be752b..605f10e42 100644
--- a/netbox/utilities/middleware.py
+++ b/netbox/utilities/middleware.py
@@ -7,7 +7,7 @@ from django.http import Http404, HttpResponseRedirect
from django.urls import reverse
from .api import is_api_request
-from .views import server_error
+from .views import server_error, rest_api_server_error
class LoginRequiredMiddleware(object):
@@ -86,6 +86,10 @@ class ExceptionHandlingMiddleware(object):
if isinstance(exception, Http404):
return
+ # Handle exceptions that occur from REST API requests
+ if is_api_request(request):
+ return rest_api_server_error(request)
+
# Determine the type of exception. If it's a common issue, return a custom error page with instructions.
custom_template = None
if isinstance(exception, ProgrammingError):
diff --git a/netbox/utilities/tests/test_filters.py b/netbox/utilities/tests/test_filters.py
index f70d7e1db..56eaabd4c 100644
--- a/netbox/utilities/tests/test_filters.py
+++ b/netbox/utilities/tests/test_filters.py
@@ -23,7 +23,8 @@ class TreeNodeMultipleChoiceFilterTest(TestCase):
class SiteFilterSet(django_filters.FilterSet):
region = TreeNodeMultipleChoiceFilter(
queryset=Region.objects.all(),
- field_name='region__in',
+ field_name='region',
+ lookup_expr='in',
to_field_name='slug',
)
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 1dae60107..df8982755 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -13,7 +13,7 @@ from django.core.exceptions import FieldDoesNotExist, ImproperlyConfigured, Obje
from django.db import transaction, IntegrityError
from django.db.models import ManyToManyField, ProtectedError
from django.forms import Form, ModelMultipleChoiceField, MultipleHiddenInput, Textarea
-from django.http import HttpResponse, HttpResponseServerError
+from django.http import HttpResponse, HttpResponseServerError, JsonResponse
from django.shortcuts import get_object_or_404, redirect, render
from django.template import loader
from django.template.exceptions import TemplateDoesNotExist
@@ -27,6 +27,7 @@ from django.views.decorators.csrf import requires_csrf_token
from django.views.defaults import ERROR_500_TEMPLATE_NAME
from django.views.generic import View
from django_tables2 import RequestConfig
+from rest_framework import status
from extras.models import CustomField, CustomFieldValue, ExportTemplate
from extras.querysets import CustomFieldQueryset
@@ -1423,8 +1424,22 @@ def server_error(request, template_name=ERROR_500_TEMPLATE_NAME):
type_, error, traceback = sys.exc_info()
return HttpResponseServerError(template.render({
- 'python_version': platform.python_version(),
- 'netbox_version': settings.VERSION,
- 'exception': str(type_),
'error': error,
+ 'exception': str(type_),
+ 'netbox_version': settings.VERSION,
+ 'python_version': platform.python_version(),
}))
+
+
+def rest_api_server_error(request, *args, **kwargs):
+ """
+ Handle exceptions and return a useful error message for REST API requests.
+ """
+ type_, error, traceback = sys.exc_info()
+ data = {
+ 'error': str(error),
+ 'exception': type_.__name__,
+ 'netbox_version': settings.VERSION,
+ 'python_version': platform.python_version(),
+ }
+ return JsonResponse(data, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py
index 712b39f9f..ce4ca3e3c 100644
--- a/netbox/virtualization/forms.py
+++ b/netbox/virtualization/forms.py
@@ -79,9 +79,19 @@ class ClusterForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
queryset=ClusterGroup.objects.all(),
required=False
)
+ region = DynamicModelChoiceField(
+ queryset=Region.objects.all(),
+ required=False,
+ initial_params={
+ 'sites': '$site'
+ }
+ )
site = DynamicModelChoiceField(
queryset=Site.objects.all(),
- required=False
+ required=False,
+ query_params={
+ 'region_id': '$region'
+ }
)
comments = CommentField()
tags = DynamicModelMultipleChoiceField(
@@ -92,7 +102,7 @@ class ClusterForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
class Meta:
model = Cluster
fields = (
- 'name', 'type', 'group', 'tenant', 'site', 'comments', 'tags',
+ 'name', 'type', 'group', 'tenant', 'region', 'site', 'comments', 'tags',
)
@@ -143,9 +153,17 @@ class ClusterBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEdit
queryset=Tenant.objects.all(),
required=False
)
+ region = DynamicModelChoiceField(
+ queryset=Region.objects.all(),
+ required=False,
+ to_field_name='slug'
+ )
site = DynamicModelChoiceField(
queryset=Site.objects.all(),
- required=False
+ required=False,
+ query_params={
+ 'region': '$region'
+ }
)
comments = CommentField(
widget=SmallTextarea,
@@ -266,7 +284,10 @@ class VirtualMachineForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
cluster_group = DynamicModelChoiceField(
queryset=ClusterGroup.objects.all(),
required=False,
- null_option='None'
+ null_option='None',
+ initial_params={
+ 'clusters': '$cluster'
+ }
)
cluster = DynamicModelChoiceField(
queryset=Cluster.objects.all(),
@@ -311,14 +332,6 @@ class VirtualMachineForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
}
def __init__(self, *args, **kwargs):
-
- # Initialize helper selector
- instance = kwargs.get('instance')
- if instance.pk and instance.cluster is not None:
- initial = kwargs.get('initial', {}).copy()
- initial['cluster_group'] = instance.cluster.group
- kwargs['initial'] = initial
-
super().__init__(*args, **kwargs)
if self.instance.pk: