{stacktrace}")
logger.error(f"Exception raised during report execution: {e}")
job.terminate(status=JobStatusChoices.STATUS_ERRORED)
- finally:
- job.data = self._results
- job.terminate()
# Perform any post-run tasks
self.post_run()
diff --git a/netbox/extras/tests/test_plugins.py b/netbox/extras/tests/test_plugins.py
index cb7629ad24e..42dde43fdff 100644
--- a/netbox/extras/tests/test_plugins.py
+++ b/netbox/extras/tests/test_plugins.py
@@ -5,8 +5,9 @@ from django.core.exceptions import ImproperlyConfigured
from django.test import Client, TestCase, override_settings
from django.urls import reverse
-from extras.plugins import PluginMenu, get_plugin_config
+from extras.plugins import PluginMenu
from extras.tests.dummy_plugin import config as dummy_config
+from extras.plugins.utils import get_plugin_config
from netbox.graphql.schema import Query
from netbox.registry import registry
diff --git a/netbox/extras/tests/test_webhooks.py b/netbox/extras/tests/test_webhooks.py
index 19264dabbeb..ef76377652d 100644
--- a/netbox/extras/tests/test_webhooks.py
+++ b/netbox/extras/tests/test_webhooks.py
@@ -31,8 +31,8 @@ class WebhookTest(APITestCase):
def setUpTestData(cls):
site_ct = ContentType.objects.get_for_model(Site)
- DUMMY_URL = "http://localhost/"
- DUMMY_SECRET = "LOOKATMEIMASECRETSTRING"
+ DUMMY_URL = 'http://localhost:9000/'
+ DUMMY_SECRET = 'LOOKATMEIMASECRETSTRING'
webhooks = Webhook.objects.bulk_create((
Webhook(name='Webhook 1', type_create=True, payload_url=DUMMY_URL, secret=DUMMY_SECRET, additional_headers='X-Foo: Bar'),
@@ -259,7 +259,7 @@ class WebhookTest(APITestCase):
name='Conditional Webhook',
type_create=True,
type_update=True,
- payload_url='http://localhost/',
+ payload_url='http://localhost:9000/',
conditions={
'and': [
{
diff --git a/netbox/ipam/api/views.py b/netbox/ipam/api/views.py
index 99b4c023d95..feffc3ff2b9 100644
--- a/netbox/ipam/api/views.py
+++ b/netbox/ipam/api/views.py
@@ -224,7 +224,10 @@ class AvailableASNsView(ObjectValidationMixin, APIView):
return Response(serializer.data)
- @extend_schema(methods=["post"], responses={201: serializers.ASNSerializer(many=True)})
+ @extend_schema(methods=["post"],
+ responses={201: serializers.ASNSerializer(many=True)},
+ request=serializers.ASNSerializer(many=True),
+ )
@advisory_lock(ADVISORY_LOCK_KEYS['available-asns'])
def post(self, request, pk):
self.queryset = self.queryset.restrict(request.user, 'add')
@@ -293,7 +296,10 @@ class AvailablePrefixesView(ObjectValidationMixin, APIView):
return Response(serializer.data)
- @extend_schema(methods=["post"], responses={201: serializers.PrefixSerializer(many=True)})
+ @extend_schema(methods=["post"],
+ responses={201: serializers.PrefixSerializer(many=True)},
+ request=serializers.PrefixSerializer(many=True),
+ )
@advisory_lock(ADVISORY_LOCK_KEYS['available-prefixes'])
def post(self, request, pk):
self.queryset = self.queryset.restrict(request.user, 'add')
@@ -388,7 +394,10 @@ class AvailableIPAddressesView(ObjectValidationMixin, APIView):
return Response(serializer.data)
- @extend_schema(methods=["post"], responses={201: serializers.IPAddressSerializer(many=True)})
+ @extend_schema(methods=["post"],
+ responses={201: serializers.IPAddressSerializer(many=True)},
+ request=serializers.IPAddressSerializer(many=True),
+ )
@advisory_lock(ADVISORY_LOCK_KEYS['available-ips'])
def post(self, request, pk):
self.queryset = self.queryset.restrict(request.user, 'add')
@@ -468,7 +477,10 @@ class AvailableVLANsView(ObjectValidationMixin, APIView):
return Response(serializer.data)
- @extend_schema(methods=["post"], responses={201: serializers.VLANSerializer(many=True)})
+ @extend_schema(methods=["post"],
+ responses={201: serializers.VLANSerializer(many=True)},
+ request=serializers.VLANSerializer(many=True),
+ )
@advisory_lock(ADVISORY_LOCK_KEYS['available-vlans'])
def post(self, request, pk):
self.queryset = self.queryset.restrict(request.user, 'add')
diff --git a/netbox/ipam/filtersets.py b/netbox/ipam/filtersets.py
index d011472d932..9b57cb273cf 100644
--- a/netbox/ipam/filtersets.py
+++ b/netbox/ipam/filtersets.py
@@ -591,6 +591,10 @@ class IPAddressFilterSet(NetBoxModelFilterSet, TenancyFilterSet):
method='_assigned_to_interface',
label=_('Is assigned to an interface'),
)
+ assigned = django_filters.BooleanFilter(
+ method='_assigned',
+ label=_('Is assigned'),
+ )
status = django_filters.MultipleChoiceFilter(
choices=IPAddressStatusChoices,
null_value=None
@@ -706,6 +710,18 @@ class IPAddressFilterSet(NetBoxModelFilterSet, TenancyFilterSet):
assigned_object_id__isnull=False
)
+ def _assigned(self, queryset, name, value):
+ if value:
+ return queryset.exclude(
+ assigned_object_type__isnull=True,
+ assigned_object_id__isnull=True
+ )
+ else:
+ return queryset.filter(
+ assigned_object_type__isnull=True,
+ assigned_object_id__isnull=True
+ )
+
class FHRPGroupFilterSet(NetBoxModelFilterSet):
protocol = django_filters.MultipleChoiceFilter(
diff --git a/netbox/ipam/forms/bulk_import.py b/netbox/ipam/forms/bulk_import.py
index 683d40f4908..3bce26249a5 100644
--- a/netbox/ipam/forms/bulk_import.py
+++ b/netbox/ipam/forms/bulk_import.py
@@ -1,7 +1,6 @@
from django import forms
from django.contrib.contenttypes.models import ContentType
from django.core.exceptions import ValidationError
-from django.db.models import Q
from django.utils.translation import gettext as _
from dcim.models import Device, Interface, Site
@@ -10,7 +9,9 @@ from ipam.constants import *
from ipam.models import *
from netbox.forms import NetBoxModelImportForm
from tenancy.models import Tenant
-from utilities.forms.fields import CSVChoiceField, CSVContentTypeField, CSVModelChoiceField, SlugField
+from utilities.forms.fields import (
+ CSVChoiceField, CSVContentTypeField, CSVModelChoiceField, CSVModelMultipleChoiceField, SlugField
+)
from virtualization.models import VirtualMachine, VMInterface
__all__ = (
@@ -41,10 +42,25 @@ class VRFImportForm(NetBoxModelImportForm):
to_field_name='name',
help_text=_('Assigned tenant')
)
+ import_targets = CSVModelMultipleChoiceField(
+ queryset=RouteTarget.objects.all(),
+ required=False,
+ to_field_name='name',
+ help_text=_('Import route targets')
+ )
+ export_targets = CSVModelMultipleChoiceField(
+ queryset=RouteTarget.objects.all(),
+ required=False,
+ to_field_name='name',
+ help_text=_('Export route targets')
+ )
class Meta:
model = VRF
- fields = ('name', 'rd', 'tenant', 'enforce_unique', 'description', 'comments', 'tags')
+ fields = (
+ 'name', 'rd', 'tenant', 'enforce_unique', 'description', 'import_targets', 'export_targets', 'comments',
+ 'tags',
+ )
class RouteTargetImportForm(NetBoxModelImportForm):
diff --git a/netbox/ipam/forms/filtersets.py b/netbox/ipam/forms/filtersets.py
index 53fecfe2f7c..f000828635e 100644
--- a/netbox/ipam/forms/filtersets.py
+++ b/netbox/ipam/forms/filtersets.py
@@ -253,7 +253,7 @@ class IPRangeFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
model = IPRange
fieldsets = (
(None, ('q', 'filter_id', 'tag')),
- ('Attriubtes', ('family', 'vrf_id', 'status', 'role_id', 'mark_utilized')),
+ ('Attributes', ('family', 'vrf_id', 'status', 'role_id', 'mark_utilized')),
('Tenant', ('tenant_group_id', 'tenant_id')),
)
family = forms.ChoiceField(
diff --git a/netbox/ipam/graphql/gfk_mixins.py b/netbox/ipam/graphql/gfk_mixins.py
index 31742c4a48a..01c79690a2b 100644
--- a/netbox/ipam/graphql/gfk_mixins.py
+++ b/netbox/ipam/graphql/gfk_mixins.py
@@ -24,11 +24,11 @@ class IPAddressAssignmentType(graphene.Union):
@classmethod
def resolve_type(cls, instance, info):
- if type(instance) == Interface:
+ if type(instance) is Interface:
return InterfaceType
- if type(instance) == FHRPGroup:
+ if type(instance) is FHRPGroup:
return FHRPGroupType
- if type(instance) == VMInterface:
+ if type(instance) is VMInterface:
return VMInterfaceType
@@ -42,11 +42,11 @@ class L2VPNAssignmentType(graphene.Union):
@classmethod
def resolve_type(cls, instance, info):
- if type(instance) == Interface:
+ if type(instance) is Interface:
return InterfaceType
- if type(instance) == VLAN:
+ if type(instance) is VLAN:
return VLANType
- if type(instance) == VMInterface:
+ if type(instance) is VMInterface:
return VMInterfaceType
@@ -59,9 +59,9 @@ class FHRPGroupInterfaceType(graphene.Union):
@classmethod
def resolve_type(cls, instance, info):
- if type(instance) == Interface:
+ if type(instance) is Interface:
return InterfaceType
- if type(instance) == VMInterface:
+ if type(instance) is VMInterface:
return VMInterfaceType
@@ -79,17 +79,17 @@ class VLANGroupScopeType(graphene.Union):
@classmethod
def resolve_type(cls, instance, info):
- if type(instance) == Cluster:
+ if type(instance) is Cluster:
return ClusterType
- if type(instance) == ClusterGroup:
+ if type(instance) is ClusterGroup:
return ClusterGroupType
- if type(instance) == Location:
+ if type(instance) is Location:
return LocationType
- if type(instance) == Rack:
+ if type(instance) is Rack:
return RackType
- if type(instance) == Region:
+ if type(instance) is Region:
return RegionType
- if type(instance) == Site:
+ if type(instance) is Site:
return SiteType
- if type(instance) == SiteGroup:
+ if type(instance) is SiteGroup:
return SiteGroupType
diff --git a/netbox/ipam/tests/test_filtersets.py b/netbox/ipam/tests/test_filtersets.py
index 3d9a6656713..0ae7544ab9a 100644
--- a/netbox/ipam/tests/test_filtersets.py
+++ b/netbox/ipam/tests/test_filtersets.py
@@ -992,6 +992,12 @@ class IPAddressTestCase(TestCase, ChangeLoggedFilterSetTests):
params = {'fhrpgroup_id': [fhrp_groups[0].pk, fhrp_groups[1].pk]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+ def test_assigned(self):
+ params = {'assigned': 'true'}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 8)
+ params = {'assigned': 'false'}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
+
def test_assigned_to_interface(self):
params = {'assigned_to_interface': 'true'}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 6)
diff --git a/netbox/ipam/utils.py b/netbox/ipam/utils.py
index 93a40e5a0c5..262fd8d46b2 100644
--- a/netbox/ipam/utils.py
+++ b/netbox/ipam/utils.py
@@ -121,7 +121,7 @@ def add_available_vlans(vlans, vlan_group=None):
})
vlans = list(vlans) + new_vlans
- vlans.sort(key=lambda v: v.vid if type(v) == VLAN else v['vid'])
+ vlans.sort(key=lambda v: v.vid if type(v) is VLAN else v['vid'])
return vlans
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 32badd2d503..d8e4d8b4785 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -216,7 +216,7 @@ class ASNRangeASNsView(generic.ObjectChildrenView):
child_model = ASN
table = tables.ASNTable
filterset = filtersets.ASNFilterSet
- template_name = 'ipam/asnrange/asns.html'
+ template_name = 'generic/object_children.html'
tab = ViewTab(
label=_('ASNs'),
badge=lambda x: x.get_child_asns().count(),
@@ -816,7 +816,6 @@ class IPAddressAssignView(generic.ObjectView):
table = None
if form.is_valid():
-
addresses = self.queryset.prefetch_related('vrf', 'tenant')
# Limit to 100 results
addresses = filtersets.IPAddressFilterSet(request.POST, addresses).qs[:100]
@@ -866,7 +865,7 @@ class IPAddressRelatedIPsView(generic.ObjectChildrenView):
child_model = IPAddress
table = tables.IPAddressTable
filterset = filtersets.IPAddressFilterSet
- template_name = 'ipam/ipaddress/ip_addresses.html'
+ template_name = 'generic/object_children.html'
tab = ViewTab(
label=_('Related IPs'),
badge=lambda x: x.get_related_ips().count(),
@@ -963,7 +962,6 @@ class FHRPGroupView(generic.ObjectView):
queryset = FHRPGroup.objects.all()
def get_extra_context(self, request, instance):
-
# Get assigned interfaces
members_table = tables.FHRPGroupAssignmentTable(
data=FHRPGroupAssignment.objects.restrict(request.user, 'view').filter(group=instance),
@@ -1077,7 +1075,7 @@ class VLANInterfacesView(generic.ObjectChildrenView):
child_model = Interface
table = tables.VLANDevicesTable
filterset = InterfaceFilterSet
- template_name = 'ipam/vlan/interfaces.html'
+ template_name = 'generic/object_children.html'
tab = ViewTab(
label=_('Device Interfaces'),
badge=lambda x: x.get_interfaces().count(),
@@ -1095,7 +1093,7 @@ class VLANVMInterfacesView(generic.ObjectChildrenView):
child_model = VMInterface
table = tables.VLANVirtualMachinesTable
filterset = VMInterfaceFilterSet
- template_name = 'ipam/vlan/vminterfaces.html'
+ template_name = 'generic/object_children.html'
tab = ViewTab(
label=_('VM Interfaces'),
badge=lambda x: x.get_vminterfaces().count(),
diff --git a/netbox/netbox/api/views.py b/netbox/netbox/api/views.py
index 5c55697ff6c..97f690762b7 100644
--- a/netbox/netbox/api/views.py
+++ b/netbox/netbox/api/views.py
@@ -11,6 +11,7 @@ from rest_framework.reverse import reverse
from rest_framework.views import APIView
from rq.worker import Worker
+from extras.plugins.utils import get_installed_plugins
from netbox.api.authentication import IsAuthenticatedOrLoginNotRequired
@@ -61,19 +62,11 @@ class StatusView(APIView):
installed_apps[app_config.name] = version
installed_apps = {k: v for k, v in sorted(installed_apps.items())}
- # Gather installed plugins
- plugins = {}
- for plugin_name in settings.PLUGINS:
- plugin_name = plugin_name.rsplit('.', 1)[-1]
- plugin_config = apps.get_app_config(plugin_name)
- plugins[plugin_name] = getattr(plugin_config, 'version', None)
- plugins = {k: v for k, v in sorted(plugins.items())}
-
return Response({
'django-version': DJANGO_VERSION,
'installed-apps': installed_apps,
'netbox-version': settings.VERSION,
- 'plugins': plugins,
+ 'plugins': get_installed_plugins(),
'python-version': platform.python_version(),
'rq-workers-running': Worker.count(get_connection('default')),
})
diff --git a/netbox/netbox/forms/base.py b/netbox/netbox/forms/base.py
index 83c238e0f36..b406ab04e7a 100644
--- a/netbox/netbox/forms/base.py
+++ b/netbox/netbox/forms/base.py
@@ -78,7 +78,10 @@ class NetBoxModelImportForm(CSVModelForm, NetBoxModelForm):
def _get_custom_fields(self, content_type):
return CustomField.objects.filter(content_types=content_type).filter(
- ui_visibility=CustomFieldVisibilityChoices.VISIBILITY_READ_WRITE
+ ui_visibility__in=[
+ CustomFieldVisibilityChoices.VISIBILITY_READ_WRITE,
+ CustomFieldVisibilityChoices.VISIBILITY_HIDDEN_IFUNSET,
+ ]
)
def _get_form_field(self, customfield):
diff --git a/netbox/netbox/models/features.py b/netbox/netbox/models/features.py
index 8bacba5345b..1e55ec2a34e 100644
--- a/netbox/netbox/models/features.py
+++ b/netbox/netbox/models/features.py
@@ -442,6 +442,19 @@ class SyncedDataMixin(models.Model):
return ret
+ def delete(self, *args, **kwargs):
+ from core.models import AutoSyncRecord
+
+ # Delete AutoSyncRecord
+ content_type = ContentType.objects.get_for_model(self)
+ AutoSyncRecord.objects.filter(
+ datafile=self.data_file,
+ object_type=content_type,
+ object_id=self.pk
+ ).delete()
+
+ return super().delete(*args, **kwargs)
+
def resolve_data_file(self):
"""
Determine the designated DataFile object identified by its parent DataSource and its path. Returns None if
diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index aec4f76f6eb..acad437fcfc 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -25,7 +25,7 @@ from netbox.constants import RQ_QUEUE_DEFAULT, RQ_QUEUE_HIGH, RQ_QUEUE_LOW
# Environment setup
#
-VERSION = '3.5.7'
+VERSION = '3.5.8'
# Hostname
HOSTNAME = platform.node()
@@ -461,8 +461,6 @@ LOGIN_REDIRECT_URL = f'/{BASE_PATH}'
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
-TEST_RUNNER = "django_rich.test.RichRunner"
-
# Exclude potentially sensitive models from wildcard view exemption. These may still be exempted
# by specifying the model individually in the EXEMPT_VIEW_PERMISSIONS configuration parameter.
EXEMPT_EXCLUDE_MODELS = (
diff --git a/netbox/netbox/tables/columns.py b/netbox/netbox/tables/columns.py
index 9ef32702622..399b3c18476 100644
--- a/netbox/netbox/tables/columns.py
+++ b/netbox/netbox/tables/columns.py
@@ -504,9 +504,9 @@ class CustomLinkColumn(tables.Column):
"""
def __init__(self, customlink, *args, **kwargs):
self.customlink = customlink
- kwargs['accessor'] = Accessor('pk')
- if 'verbose_name' not in kwargs:
- kwargs['verbose_name'] = customlink.name
+ kwargs.setdefault('accessor', Accessor('pk'))
+ kwargs.setdefault('orderable', False)
+ kwargs.setdefault('verbose_name', customlink.name)
super().__init__(*args, **kwargs)
diff --git a/netbox/netbox/tables/tables.py b/netbox/netbox/tables/tables.py
index 20eab822db4..975311e4a82 100644
--- a/netbox/netbox/tables/tables.py
+++ b/netbox/netbox/tables/tables.py
@@ -54,7 +54,7 @@ class BaseTable(tables.Table):
# 3. Meta.fields
selected_columns = None
if user is not None and not isinstance(user, AnonymousUser):
- selected_columns = user.config.get(f"tables.{self.__class__.__name__}.columns")
+ selected_columns = user.config.get(f"tables.{self.name}.columns")
if not selected_columns:
selected_columns = getattr(self.Meta, 'default_columns', self.Meta.fields)
@@ -113,6 +113,10 @@ class BaseTable(tables.Table):
columns.append((name, column.verbose_name))
return columns
+ @property
+ def name(self):
+ return self.__class__.__name__
+
@property
def available_columns(self):
return self._get_columns(visible=False)
@@ -138,17 +142,16 @@ class BaseTable(tables.Table):
"""
# Save ordering preference
if request.user.is_authenticated:
- table_name = self.__class__.__name__
if self.prefixed_order_by_field in request.GET:
if request.GET[self.prefixed_order_by_field]:
# If an ordering has been specified as a query parameter, save it as the
# user's preferred ordering for this table.
ordering = request.GET.getlist(self.prefixed_order_by_field)
- request.user.config.set(f'tables.{table_name}.ordering', ordering, commit=True)
+ request.user.config.set(f'tables.{self.name}.ordering', ordering, commit=True)
else:
# If the ordering has been set to none (empty), clear any existing preference.
- request.user.config.clear(f'tables.{table_name}.ordering', commit=True)
- elif ordering := request.user.config.get(f'tables.{table_name}.ordering'):
+ request.user.config.clear(f'tables.{self.name}.ordering', commit=True)
+ elif ordering := request.user.config.get(f'tables.{self.name}.ordering'):
# If no ordering has been specified, set the preferred ordering (if any).
self.order_by = ordering
diff --git a/netbox/netbox/views/errors.py b/netbox/netbox/views/errors.py
index c74c67cef06..a81d45cb5cb 100644
--- a/netbox/netbox/views/errors.py
+++ b/netbox/netbox/views/errors.py
@@ -11,6 +11,8 @@ from django.views.defaults import ERROR_500_TEMPLATE_NAME, page_not_found
from django.views.generic import View
from sentry_sdk import capture_message
+from extras.plugins.utils import get_installed_plugins
+
__all__ = (
'handler_404',
'handler_500',
@@ -53,4 +55,5 @@ def handler_500(request, template_name=ERROR_500_TEMPLATE_NAME):
'exception': str(type_),
'netbox_version': settings.VERSION,
'python_version': platform.python_version(),
+ 'plugins': get_installed_plugins(),
}))
diff --git a/netbox/netbox/views/generic/object_views.py b/netbox/netbox/views/generic/object_views.py
index 1ba789cf187..99d8ff5401c 100644
--- a/netbox/netbox/views/generic/object_views.py
+++ b/netbox/netbox/views/generic/object_views.py
@@ -143,9 +143,12 @@ class ObjectChildrenView(ObjectView, ActionsMixin, TableMixin):
return render(request, self.get_template_name(), {
'object': instance,
'child_model': self.child_model,
+ 'base_template': f'{instance._meta.app_label}/{instance._meta.model_name}.html',
'table': table,
+ 'table_config': f'{table.name}_config',
'actions': actions,
'tab': self.tab,
+ 'return_url': request.get_full_path(),
**self.get_extra_context(request, instance),
})
diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js
index b62436d757a..84bfecae349 100644
--- a/netbox/project-static/dist/netbox.js
+++ b/netbox/project-static/dist/netbox.js
@@ -1,11 +1,11 @@
-(()=>{var j_=Object.create;var ia=Object.defineProperty,H_=Object.defineProperties,B_=Object.getOwnPropertyDescriptor,F_=Object.getOwnPropertyDescriptors,z_=Object.getOwnPropertyNames,hh=Object.getOwnPropertySymbols,$_=Object.getPrototypeOf,ph=Object.prototype.hasOwnProperty,U_=Object.prototype.propertyIsEnumerable;var lu=(yr,br,mr)=>br in yr?ia(yr,br,{enumerable:!0,configurable:!0,writable:!0,value:mr}):yr[br]=mr,ci=(yr,br)=>{for(var mr in br||(br={}))ph.call(br,mr)&&lu(yr,mr,br[mr]);if(hh)for(var mr of hh(br))U_.call(br,mr)&&lu(yr,mr,br[mr]);return yr},al=(yr,br)=>H_(yr,F_(br)),mh=yr=>ia(yr,"__esModule",{value:!0});var jr=(yr,br)=>()=>(br||yr((br={exports:{}}).exports,br),br.exports),V_=(yr,br)=>{mh(yr);for(var mr in br)ia(yr,mr,{get:br[mr],enumerable:!0})},W_=(yr,br,mr)=>{if(br&&typeof br=="object"||typeof br=="function")for(let Er of z_(br))!ph.call(yr,Er)&&Er!=="default"&&ia(yr,Er,{get:()=>br[Er],enumerable:!(mr=B_(br,Er))||mr.enumerable});return yr},vn=yr=>W_(mh(ia(yr!=null?j_($_(yr)):{},"default",yr&&yr.__esModule&&"default"in yr?{get:()=>yr.default,enumerable:!0}:{value:yr,enumerable:!0})),yr);var di=(yr,br,mr)=>(lu(yr,typeof br!="symbol"?br+"":br,mr),mr);var $i=(yr,br,mr)=>new Promise((Er,wr)=>{var _r=Tr=>{try{Sr(mr.next(Tr))}catch(Dr){wr(Dr)}},xr=Tr=>{try{Sr(mr.throw(Tr))}catch(Dr){wr(Dr)}},Sr=Tr=>Tr.done?Er(Tr.value):Promise.resolve(Tr.value).then(_r,xr);Sr((mr=mr.apply(yr,br)).next())});var Jp=jr((exports,module)=>{(function(yr,br){typeof define=="function"&&define.amd?define([],br):yr.htmx=yr.htmx||br()})(typeof self!="undefined"?self:exports,function(){return function(){"use strict";var U={onLoad:t,process:vt,on:X,off:F,trigger:$,ajax:nr,find:R,findAll:O,closest:N,values:function(yr,br){var mr=Pt(yr,br||"post");return mr.values},remove:q,addClass:L,removeClass:T,toggleClass:A,takeClass:H,defineExtension:fr,removeExtension:cr,logAll:C,logger:null,config:{historyEnabled:!0,historyCacheSize:10,refreshOnHistoryMiss:!1,defaultSwapStyle:"innerHTML",defaultSwapDelay:0,defaultSettleDelay:20,includeIndicatorStyles:!0,indicatorClass:"htmx-indicator",requestClass:"htmx-request",addedClass:"htmx-added",settlingClass:"htmx-settling",swappingClass:"htmx-swapping",allowEval:!0,inlineScriptNonce:"",attributesToSettle:["class","style","width","height"],withCredentials:!1,timeout:0,wsReconnectDelay:"full-jitter",disableSelector:"[hx-disable], [data-hx-disable]",useTemplateFragments:!1,scrollBehavior:"smooth",defaultFocusScroll:!1},parseInterval:v,_:e,createEventSource:function(yr){return new EventSource(yr,{withCredentials:!0})},createWebSocket:function(yr){return new WebSocket(yr,[])},version:"1.8.0"},r={addTriggerHandler:st,bodyContains:K,canAccessLocalStorage:E,filterValues:Ut,hasAttribute:o,getAttributeValue:V,getClosestMatch:h,getExpressionVars:Qt,getHeaders:Bt,getInputValues:Pt,getInternalData:W,getSwapSpecification:_t,getTriggerSpecs:Me,getTarget:re,makeFragment:g,mergeObjects:Y,makeSettleInfo:Gt,oobSwap:ae,selectAndSwap:Ee,settleImmediately:Lt,shouldCancel:je,triggerEvent:$,triggerErrorEvent:J,withExtensions:xt},n=["get","post","put","delete","patch"],i=n.map(function(yr){return"[hx-"+yr+"], [data-hx-"+yr+"]"}).join(", ");function v(yr){if(yr!=null)return yr.slice(-2)=="ms"?parseFloat(yr.slice(0,-2))||void 0:yr.slice(-1)=="s"?parseFloat(yr.slice(0,-1))*1e3||void 0:yr.slice(-1)=="m"?parseFloat(yr.slice(0,-1))*1e3*60||void 0:parseFloat(yr)||void 0}function f(yr,br){return yr.getAttribute&&yr.getAttribute(br)}function o(yr,br){return yr.hasAttribute&&(yr.hasAttribute(br)||yr.hasAttribute("data-"+br))}function V(yr,br){return f(yr,br)||f(yr,"data-"+br)}function u(yr){return yr.parentElement}function _(){return document}function h(yr,br){for(;yr&&!br(yr);)yr=u(yr);return yr||null}function a(yr,br,mr){var Er=V(br,mr),wr=V(br,"hx-disinherit");return yr!==br&&wr&&(wr==="*"||wr.split(" ").indexOf(mr)>=0)?"unset":Er}function z(yr,br){var mr=null;if(h(yr,function(Er){return mr=a(yr,Er,br)}),mr!=="unset")return mr}function d(yr,br){var mr=yr.matches||yr.matchesSelector||yr.msMatchesSelector||yr.mozMatchesSelector||yr.webkitMatchesSelector||yr.oMatchesSelector;return mr&&mr.call(yr,br)}function s(yr){var br=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,mr=br.exec(yr);return mr?mr[1].toLowerCase():""}function l(yr,br){for(var mr=new DOMParser,Er=mr.parseFromString(yr,"text/html"),wr=Er.body;br>0;)br--,wr=wr.firstChild;return wr==null&&(wr=_().createDocumentFragment()),wr}function g(yr){if(U.config.useTemplateFragments){var br=l(""+yr+"",0);return br.querySelector("template").content}else{var mr=s(yr);switch(mr){case"thead":case"tbody":case"tfoot":case"colgroup":case"caption":return l("If further assistance is required, please post to the NetBox discussion forum on GitHub.
diff --git a/netbox/templates/dcim/device/components_base.html b/netbox/templates/dcim/device/components_base.html new file mode 100644 index 00000000000..1e3d8a39de4 --- /dev/null +++ b/netbox/templates/dcim/device/components_base.html @@ -0,0 +1,15 @@ +{% extends 'generic/object_children.html' %} +{% load helpers %} + +{% block bulk_edit_controls %} + {{ block.super }} + {% with bulk_rename_view=child_model|validated_viewname:"bulk_rename" %} + {% if 'bulk_rename' in actions and bulk_rename_view %} + + {% endif %} + {% endwith %} +{% endblock bulk_edit_controls %} diff --git a/netbox/templates/dcim/device/consoleports.html b/netbox/templates/dcim/device/consoleports.html index ccd12f61c87..6e1c1b699e0 100644 --- a/netbox/templates/dcim/device/consoleports.html +++ b/netbox/templates/dcim/device/consoleports.html @@ -1,57 +1,27 @@ -{% extends 'dcim/device/base.html' %} -{% load render_table from django_tables2 %} +{% extends 'dcim/device/components_base.html' %} {% load helpers %} -{% load static %} -{% block content %} - {% include 'inc/table_controls_htmx.html' with table_modal="DeviceConsolePortTable_config" %} - - -{% endblock %} + {% endwith %} +{% endblock bulk_delete_controls %} -{% block modals %} - {{ block.super }} - {% table_config_form table %} -{% endblock modals %} +{% block bulk_extra_controls %} + {{ block.super }} + {% if perms.dcim.add_consoleport %} + + {% endif %} +{% endblock bulk_extra_controls %} diff --git a/netbox/templates/dcim/device/consoleserverports.html b/netbox/templates/dcim/device/consoleserverports.html index 43396651d2a..637f06118a9 100644 --- a/netbox/templates/dcim/device/consoleserverports.html +++ b/netbox/templates/dcim/device/consoleserverports.html @@ -1,57 +1,27 @@ -{% extends 'dcim/device/base.html' %} -{% load render_table from django_tables2 %} +{% extends 'dcim/device/components_base.html' %} {% load helpers %} -{% load static %} -{% block content %} - {% include 'inc/table_controls_htmx.html' with table_modal="DeviceConsoleServerPortTable_config" %} - - -{% endblock %} + {% endwith %} +{% endblock bulk_delete_controls %} -{% block modals %} - {{ block.super }} - {% table_config_form table %} -{% endblock modals %} +{% block bulk_extra_controls %} + {{ block.super }} + {% if perms.dcim.add_consoleserverport %} + + {% endif %} +{% endblock bulk_extra_controls %} \ No newline at end of file diff --git a/netbox/templates/dcim/device/devicebays.html b/netbox/templates/dcim/device/devicebays.html index 9453b9a59a6..0a7bbba7f8f 100644 --- a/netbox/templates/dcim/device/devicebays.html +++ b/netbox/templates/dcim/device/devicebays.html @@ -1,50 +1,13 @@ -{% extends 'dcim/device/base.html' %} -{% load render_table from django_tables2 %} -{% load helpers %} -{% load static %} +{% extends 'dcim/device/components_base.html' %} -{% block content %} - {% include 'inc/table_controls_htmx.html' with table_modal="DeviceDeviceBayTable_config" %} - - -{% endblock %} - -{% block modals %} - {{ block.super }} - {% table_config_form table %} -{% endblock modals %} + {% endif %} +{% endblock bulk_extra_controls %} diff --git a/netbox/templates/dcim/device/frontports.html b/netbox/templates/dcim/device/frontports.html index dd0767d954f..4530646113b 100644 --- a/netbox/templates/dcim/device/frontports.html +++ b/netbox/templates/dcim/device/frontports.html @@ -1,57 +1,27 @@ -{% extends 'dcim/device/base.html' %} -{% load render_table from django_tables2 %} +{% extends 'dcim/device/components_base.html' %} {% load helpers %} -{% load static %} -{% block content %} - {% include 'inc/table_controls_htmx.html' with table_modal="DeviceFrontPortTable_config" %} - - -{% endblock %} + {% endwith %} +{% endblock bulk_delete_controls %} -{% block modals %} - {{ block.super }} - {% table_config_form table %} -{% endblock modals %} +{% block bulk_extra_controls %} + {{ block.super }} + {% if perms.dcim.add_frontport %} + + {% endif %} +{% endblock bulk_extra_controls %} \ No newline at end of file diff --git a/netbox/templates/dcim/device/interfaces.html b/netbox/templates/dcim/device/interfaces.html index c0e9a38b63d..77810126546 100644 --- a/netbox/templates/dcim/device/interfaces.html +++ b/netbox/templates/dcim/device/interfaces.html @@ -1,66 +1,27 @@ -{% extends 'dcim/device/base.html' %} -{% load render_table from django_tables2 %} +{% extends 'dcim/device/components_base.html' %} {% load helpers %} -{% load static %} -{% block content %} - {% include 'dcim/device/inc/interface_table_controls.html' with table_modal="DeviceInterfaceTable_config" %} - - -{% endblock %} - -{% block modals %} - {{ block.super }} - {% table_config_form table %} -{% endblock modals %} +{% endblock bulk_extra_controls %} diff --git a/netbox/templates/dcim/device/inventory.html b/netbox/templates/dcim/device/inventory.html index 9e11031ec13..d4c9a9b689f 100644 --- a/netbox/templates/dcim/device/inventory.html +++ b/netbox/templates/dcim/device/inventory.html @@ -1,50 +1,13 @@ -{% extends 'dcim/device/base.html' %} -{% load render_table from django_tables2 %} -{% load helpers %} -{% load static %} +{% extends 'dcim/device/components_base.html' %} -{% block content %} - {% include 'inc/table_controls_htmx.html' with table_modal="DeviceInventoryItemTable_config" %} - - -{% endblock %} - -{% block modals %} - {{ block.super }} - {% table_config_form table %} -{% endblock modals %} + {% endif %} +{% endblock bulk_extra_controls %} diff --git a/netbox/templates/dcim/device/modulebays.html b/netbox/templates/dcim/device/modulebays.html index 7f0aacf1f2a..fc616f8288a 100644 --- a/netbox/templates/dcim/device/modulebays.html +++ b/netbox/templates/dcim/device/modulebays.html @@ -1,46 +1,13 @@ -{% extends 'dcim/device/base.html' %} -{% load render_table from django_tables2 %} -{% load helpers %} -{% load static %} +{% extends 'dcim/device/components_base.html' %} -{% block content %} - {% include 'inc/table_controls_htmx.html' with table_modal="DeviceModuleBayTable_config" %} - - - {% table_config_form table %} -{% endblock %} + {% endif %} +{% endblock bulk_extra_controls %} \ No newline at end of file diff --git a/netbox/templates/dcim/device/poweroutlets.html b/netbox/templates/dcim/device/poweroutlets.html index 66b21b7afbe..f3106745306 100644 --- a/netbox/templates/dcim/device/poweroutlets.html +++ b/netbox/templates/dcim/device/poweroutlets.html @@ -1,57 +1,27 @@ -{% extends 'dcim/device/base.html' %} -{% load render_table from django_tables2 %} +{% extends 'dcim/device/components_base.html' %} {% load helpers %} -{% load static %} -{% block content %} - {% include 'inc/table_controls_htmx.html' with table_modal="DevicePowerOutletTable_config" %} - - -{% endblock %} + {% endwith %} +{% endblock bulk_delete_controls %} -{% block modals %} - {{ block.super }} - {% table_config_form table %} -{% endblock modals %} +{% block bulk_extra_controls %} + {{ block.super }} + {% if perms.dcim.add_poweroutlet %} + + {% endif %} +{% endblock bulk_extra_controls %} diff --git a/netbox/templates/dcim/device/powerports.html b/netbox/templates/dcim/device/powerports.html index d9e1e121a30..ad1dbacd854 100644 --- a/netbox/templates/dcim/device/powerports.html +++ b/netbox/templates/dcim/device/powerports.html @@ -1,57 +1,27 @@ -{% extends 'dcim/device/base.html' %} -{% load render_table from django_tables2 %} +{% extends 'dcim/device/components_base.html' %} {% load helpers %} -{% load static %} -{% block content %} - {% include 'inc/table_controls_htmx.html' with table_modal="DevicePowerPortTable_config" %} - - -{% endblock %} + {% endwith %} +{% endblock bulk_delete_controls %} -{% block modals %} - {{ block.super }} - {% table_config_form table %} -{% endblock modals %} +{% block bulk_extra_controls %} + {{ block.super }} + {% if perms.dcim.add_powerport %} + + {% endif %} +{% endblock bulk_extra_controls %} diff --git a/netbox/templates/dcim/device/rearports.html b/netbox/templates/dcim/device/rearports.html index ce194cc7879..dfa406386c4 100644 --- a/netbox/templates/dcim/device/rearports.html +++ b/netbox/templates/dcim/device/rearports.html @@ -1,57 +1,27 @@ -{% extends 'dcim/device/base.html' %} -{% load render_table from django_tables2 %} -{% load static %} +{% extends 'dcim/device/components_base.html' %} {% load helpers %} -{% block content %} - {% include 'inc/table_controls_htmx.html' with table_modal="DeviceRearPortTable_config" %} - - -{% endblock %} + {% endwith %} +{% endblock bulk_delete_controls %} -{% block modals %} - {{ block.super }} - {% table_config_form table %} -{% endblock modals %} +{% block bulk_extra_controls %} + {{ block.super }} + {% if perms.dcim.add_rearport %} + + {% endif %} +{% endblock bulk_extra_controls %} \ No newline at end of file diff --git a/netbox/templates/dcim/rack/non_racked_devices.html b/netbox/templates/dcim/rack/non_racked_devices.html index 700c663698d..e52b8647f9c 100644 --- a/netbox/templates/dcim/rack/non_racked_devices.html +++ b/netbox/templates/dcim/rack/non_racked_devices.html @@ -1,5 +1,4 @@ -{% extends 'dcim/rack/base.html' %} -{% load helpers %} +{% extends 'generic/object_children.html' %} {% block extra_controls %} {% if perms.dcim.add_device %} @@ -10,42 +9,4 @@