Please take a few minutes to tell us about your NetBox deployment.
-
The premiere source of truth powering network automation
diff --git a/base_requirements.txt b/base_requirements.txt
index 1e9a45048d..40e0224e22 100644
--- a/base_requirements.txt
+++ b/base_requirements.txt
@@ -84,7 +84,8 @@ feedparser
# Django wrapper for Graphene (GraphQL support)
# https://github.com/graphql-python/graphene-django/releases
-graphene_django
+# Pinned to v3.0.0 for GraphiQL UI issue (see #12762)
+graphene_django==3.0.0
# WSGI HTTP server
# https://docs.gunicorn.org/en/latest/news.html
diff --git a/docs/models/extras/customfield.md b/docs/models/extras/customfield.md
index 0d92ec6563..df0408f7c7 100644
--- a/docs/models/extras/customfield.md
+++ b/docs/models/extras/customfield.md
@@ -68,11 +68,12 @@ Defines how filters are evaluated against custom field values.
Controls how and whether the custom field is displayed within the NetBox user interface.
-| Option | Description |
-|------------|--------------------------------------|
-| Read/write | Display and permit editing (default) |
-| Read-only | Display field but disallow editing |
-| Hidden | Do not display field in the UI |
+| Option | Description |
+|-------------------|--------------------------------------------------|
+| Read/write | Display and permit editing (default) |
+| Read-only | Display field but disallow editing |
+| Hidden | Do not display field in the UI |
+| Hidden (if unset) | Display in the UI only when a value has been set |
### Default
diff --git a/docs/release-notes/version-3.5.md b/docs/release-notes/version-3.5.md
index 24d1ce2dc8..3143bbdeaf 100644
--- a/docs/release-notes/version-3.5.md
+++ b/docs/release-notes/version-3.5.md
@@ -1,5 +1,34 @@
# NetBox v3.5
+## v3.5.3 (2023-06-02)
+
+### Enhancements
+
+* [#9876](https://github.com/netbox-community/netbox/issues/9876) - Improve support for matching tags in conditional rules
+* [#12015](https://github.com/netbox-community/netbox/issues/12015) - Add device type & role filters for device components
+* [#12470](https://github.com/netbox-community/netbox/issues/12470) - Collapse context data by default when viewing a rendered device configuration
+* [#12562](https://github.com/netbox-community/netbox/issues/12562) - Record client IP address when logging authentication failures
+* [#12597](https://github.com/netbox-community/netbox/issues/12597) - Add an option to hide custom fields only if unset
+* [#12599](https://github.com/netbox-community/netbox/issues/12599) - Apply filter parameters to links in object count dashboard widgets
+
+### Bug Fixes
+
+* [#7503](https://github.com/netbox-community/netbox/issues/7503) - Improve rack space validation when creating multiple devices via REST API
+* [#11539](https://github.com/netbox-community/netbox/issues/11539) - Fix exception when applying "empty" filter lookup with invalid value
+* [#11934](https://github.com/netbox-community/netbox/issues/11934) - Prevent reassignment of an IP address designated as primary for its parent object
+* [#12538](https://github.com/netbox-community/netbox/issues/12538) - Redirect user to originating view after editing/deleting an image attachment
+* [#12627](https://github.com/netbox-community/netbox/issues/12627) - Restore hover preview for embedded image attachment tables
+* [#12694](https://github.com/netbox-community/netbox/issues/12694) - Strip leading & trailing whitespace from custom link URL & text
+* [#12702](https://github.com/netbox-community/netbox/issues/12702) - Fix sizing of rear port selection widget on front port template creation form
+* [#12715](https://github.com/netbox-community/netbox/issues/12715) - Use contact assignments table to display the contacts assigned to an object
+* [#12730](https://github.com/netbox-community/netbox/issues/12730) - Fix extraneous contacts listed in object contact assignments view
+* [#12742](https://github.com/netbox-community/netbox/issues/12742) - Object counts dashboard widget should support URL-compatible query filters
+* [#12762](https://github.com/netbox-community/netbox/issues/12762) - Fix GraphiQL UI by reverting graphene-django to earlier version
+* [#12745](https://github.com/netbox-community/netbox/issues/12745) - Escape display text in API-backed selection widgets
+* [#12779](https://github.com/netbox-community/netbox/issues/12779) - Correct arithmetic for converting inches to meters
+
+---
+
## v3.5.2 (2023-05-22)
### Enhancements
diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py
index a62315b573..5b87c4e5d5 100644
--- a/netbox/dcim/api/views.py
+++ b/netbox/dcim/api/views.py
@@ -1,12 +1,12 @@
from django.http import Http404, HttpResponse
from django.shortcuts import get_object_or_404
-from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiParameter
from drf_spectacular.types import OpenApiTypes
+from drf_spectacular.utils import extend_schema, OpenApiParameter
from rest_framework.decorators import action
from rest_framework.renderers import JSONRenderer
from rest_framework.response import Response
-from rest_framework.status import HTTP_400_BAD_REQUEST
from rest_framework.routers import APIRootView
+from rest_framework.status import HTTP_400_BAD_REQUEST
from rest_framework.viewsets import ViewSet
from circuits.models import Circuit
@@ -14,7 +14,6 @@ from dcim import filtersets
from dcim.constants import CABLE_TRACE_SVG_DEFAULT_WIDTH
from dcim.models import *
from dcim.svg import CableTraceSVG
-from extras.api.nested_serializers import NestedConfigTemplateSerializer
from extras.api.mixins import ConfigContextQuerySetMixin, ConfigTemplateRenderMixin
from ipam.models import Prefix, VLAN
from netbox.api.authentication import IsAuthenticatedOrLoginNotRequired
@@ -22,6 +21,7 @@ from netbox.api.metadata import ContentTypeMetadata
from netbox.api.pagination import StripCountAnnotationsPaginator
from netbox.api.renderers import TextRenderer
from netbox.api.viewsets import NetBoxModelViewSet
+from netbox.api.viewsets.mixins import SequentialBulkCreatesMixin
from netbox.constants import NESTED_SERIALIZER_PREFIX
from utilities.api import get_serializer_for_model
from utilities.utils import count_related
@@ -386,7 +386,12 @@ class PlatformViewSet(NetBoxModelViewSet):
# Devices/modules
#
-class DeviceViewSet(ConfigContextQuerySetMixin, ConfigTemplateRenderMixin, NetBoxModelViewSet):
+class DeviceViewSet(
+ SequentialBulkCreatesMixin,
+ ConfigContextQuerySetMixin,
+ ConfigTemplateRenderMixin,
+ NetBoxModelViewSet
+):
queryset = Device.objects.prefetch_related(
'device_type__manufacturer', 'device_role', 'tenant', 'platform', 'site', 'location', 'rack', 'parent_bay',
'virtual_chassis__master', 'primary_ip4__nat_outside', 'primary_ip6__nat_outside', 'config_template', 'tags',
diff --git a/netbox/dcim/filtersets.py b/netbox/dcim/filtersets.py
index fccaa72f08..e784be8e85 100644
--- a/netbox/dcim/filtersets.py
+++ b/netbox/dcim/filtersets.py
@@ -1219,6 +1219,28 @@ class DeviceComponentFilterSet(django_filters.FilterSet):
to_field_name='name',
label=_('Device (name)'),
)
+ device_type_id = django_filters.ModelMultipleChoiceFilter(
+ field_name='device__device_type',
+ queryset=DeviceType.objects.all(),
+ label=_('Device type (ID)'),
+ )
+ device_type = django_filters.ModelMultipleChoiceFilter(
+ field_name='device__device_type__model',
+ queryset=DeviceType.objects.all(),
+ to_field_name='model',
+ label=_('Device type (model)'),
+ )
+ device_role_id = django_filters.ModelMultipleChoiceFilter(
+ field_name='device__device_role',
+ queryset=DeviceRole.objects.all(),
+ label=_('Device role (ID)'),
+ )
+ device_role = django_filters.ModelMultipleChoiceFilter(
+ field_name='device__device_role__slug',
+ queryset=DeviceRole.objects.all(),
+ to_field_name='slug',
+ label=_('Device role (slug)'),
+ )
virtual_chassis_id = django_filters.ModelMultipleChoiceFilter(
field_name='device__virtual_chassis',
queryset=VirtualChassis.objects.all(),
diff --git a/netbox/dcim/forms/filtersets.py b/netbox/dcim/forms/filtersets.py
index d31bba0305..4edee6014e 100644
--- a/netbox/dcim/forms/filtersets.py
+++ b/netbox/dcim/forms/filtersets.py
@@ -102,13 +102,25 @@ class DeviceComponentFilterForm(NetBoxModelFilterSetForm):
required=False,
label=_('Virtual Chassis')
)
+ device_type_id = DynamicModelMultipleChoiceField(
+ queryset=DeviceType.objects.all(),
+ required=False,
+ label=_('Device type')
+ )
+ device_role_id = DynamicModelMultipleChoiceField(
+ queryset=DeviceRole.objects.all(),
+ required=False,
+ label=_('Device role')
+ )
device_id = DynamicModelMultipleChoiceField(
queryset=Device.objects.all(),
required=False,
query_params={
'site_id': '$site_id',
'location_id': '$location_id',
- 'virtual_chassis_id': '$virtual_chassis_id'
+ 'virtual_chassis_id': '$virtual_chassis_id',
+ 'device_type_id': '$device_type_id',
+ 'role_id': '$device_role_id'
},
label=_('Device')
)
@@ -1070,7 +1082,8 @@ class ConsolePortFilterForm(PathEndpointFilterForm, DeviceComponentFilterForm):
fieldsets = (
(None, ('q', 'filter_id', 'tag')),
('Attributes', ('name', 'label', 'type', 'speed')),
- ('Device', ('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', 'virtual_chassis_id', 'device_id')),
+ ('Location', ('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id')),
+ ('Device', ('device_type_id', 'device_role_id', 'device_id', 'virtual_chassis_id')),
('Connection', ('cabled', 'connected', 'occupied')),
)
type = forms.MultipleChoiceField(
@@ -1089,7 +1102,8 @@ class ConsoleServerPortFilterForm(PathEndpointFilterForm, DeviceComponentFilterF
fieldsets = (
(None, ('q', 'filter_id', 'tag')),
('Attributes', ('name', 'label', 'type', 'speed')),
- ('Device', ('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', 'virtual_chassis_id', 'device_id')),
+ ('Location', ('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id')),
+ ('Device', ('device_type_id', 'device_role_id', 'device_id', 'virtual_chassis_id')),
('Connection', ('cabled', 'connected', 'occupied')),
)
type = forms.MultipleChoiceField(
@@ -1108,7 +1122,8 @@ class PowerPortFilterForm(PathEndpointFilterForm, DeviceComponentFilterForm):
fieldsets = (
(None, ('q', 'filter_id', 'tag')),
('Attributes', ('name', 'label', 'type')),
- ('Device', ('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', 'virtual_chassis_id', 'device_id')),
+ ('Location', ('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id')),
+ ('Device', ('device_type_id', 'device_role_id', 'device_id', 'virtual_chassis_id')),
('Connection', ('cabled', 'connected', 'occupied')),
)
type = forms.MultipleChoiceField(
@@ -1123,7 +1138,8 @@ class PowerOutletFilterForm(PathEndpointFilterForm, DeviceComponentFilterForm):
fieldsets = (
(None, ('q', 'filter_id', 'tag')),
('Attributes', ('name', 'label', 'type')),
- ('Device', ('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', 'virtual_chassis_id', 'device_id')),
+ ('Location', ('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id')),
+ ('Device', ('device_type_id', 'device_role_id', 'device_id', 'virtual_chassis_id')),
('Connection', ('cabled', 'connected', 'occupied')),
)
type = forms.MultipleChoiceField(
@@ -1141,8 +1157,8 @@ class InterfaceFilterForm(PathEndpointFilterForm, DeviceComponentFilterForm):
('Addressing', ('vrf_id', 'l2vpn_id', 'mac_address', 'wwn')),
('PoE', ('poe_mode', 'poe_type')),
('Wireless', ('rf_role', 'rf_channel', 'rf_channel_width', 'tx_power')),
- ('Device', ('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', 'virtual_chassis_id',
- 'device_id', 'vdc_id')),
+ ('Location', ('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id')),
+ ('Device', ('device_type_id', 'device_role_id', 'device_id', 'virtual_chassis_id', 'vdc_id')),
('Connection', ('cabled', 'connected', 'occupied')),
)
vdc_id = DynamicModelMultipleChoiceField(
@@ -1242,7 +1258,8 @@ class FrontPortFilterForm(CabledFilterForm, DeviceComponentFilterForm):
fieldsets = (
(None, ('q', 'filter_id', 'tag')),
('Attributes', ('name', 'label', 'type', 'color')),
- ('Device', ('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', 'virtual_chassis_id', 'device_id')),
+ ('Location', ('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id')),
+ ('Device', ('device_type_id', 'device_role_id', 'device_id', 'virtual_chassis_id')),
('Cable', ('cabled', 'occupied')),
)
model = FrontPort
@@ -1261,7 +1278,8 @@ class RearPortFilterForm(CabledFilterForm, DeviceComponentFilterForm):
fieldsets = (
(None, ('q', 'filter_id', 'tag')),
('Attributes', ('name', 'label', 'type', 'color')),
- ('Device', ('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', 'virtual_chassis_id', 'device_id')),
+ ('Location', ('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id')),
+ ('Device', ('device_type_id', 'device_role_id', 'device_id', 'virtual_chassis_id')),
('Cable', ('cabled', 'occupied')),
)
type = forms.MultipleChoiceField(
@@ -1279,7 +1297,8 @@ class ModuleBayFilterForm(DeviceComponentFilterForm):
fieldsets = (
(None, ('q', 'filter_id', 'tag')),
('Attributes', ('name', 'label', 'position')),
- ('Device', ('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', 'virtual_chassis_id', 'device_id')),
+ ('Location', ('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id')),
+ ('Device', ('device_type_id', 'device_role_id', 'device_id', 'virtual_chassis_id')),
)
tag = TagFilterField(model)
position = forms.CharField(
@@ -1292,7 +1311,8 @@ class DeviceBayFilterForm(DeviceComponentFilterForm):
fieldsets = (
(None, ('q', 'filter_id', 'tag')),
('Attributes', ('name', 'label')),
- ('Device', ('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', 'virtual_chassis_id', 'device_id')),
+ ('Location', ('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id')),
+ ('Device', ('device_type_id', 'device_role_id', 'device_id', 'virtual_chassis_id')),
)
tag = TagFilterField(model)
@@ -1302,7 +1322,8 @@ class InventoryItemFilterForm(DeviceComponentFilterForm):
fieldsets = (
(None, ('q', 'filter_id', 'tag')),
('Attributes', ('name', 'label', 'role_id', 'manufacturer_id', 'serial', 'asset_tag', 'discovered')),
- ('Device', ('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', 'virtual_chassis_id', 'device_id')),
+ ('Location', ('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id')),
+ ('Device', ('device_type_id', 'device_role_id', 'device_id', 'virtual_chassis_id')),
)
role_id = DynamicModelMultipleChoiceField(
queryset=InventoryItemRole.objects.all(),
diff --git a/netbox/dcim/forms/object_create.py b/netbox/dcim/forms/object_create.py
index d4c9e6ec33..9589ab5335 100644
--- a/netbox/dcim/forms/object_create.py
+++ b/netbox/dcim/forms/object_create.py
@@ -101,6 +101,7 @@ class FrontPortTemplateCreateForm(ComponentCreateForm, model_forms.FrontPortTemp
choices=[],
label=_('Rear ports'),
help_text=_('Select one rear port assignment for each front port being created.'),
+ widget=forms.SelectMultiple(attrs={'size': 6})
)
# Override fieldsets from FrontPortTemplateForm to omit rear_port_position
diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py
index 3445b7e758..af15e13438 100644
--- a/netbox/dcim/tests/test_api.py
+++ b/netbox/dcim/tests/test_api.py
@@ -1115,7 +1115,7 @@ class DeviceTest(APIViewTestCases.APIViewTestCase):
device_types = (
DeviceType(manufacturer=manufacturer, model='Device Type 1', slug='device-type-1'),
- DeviceType(manufacturer=manufacturer, model='Device Type 2', slug='device-type-2'),
+ DeviceType(manufacturer=manufacturer, model='Device Type 2', slug='device-type-2', u_height=2),
)
DeviceType.objects.bulk_create(device_types)
@@ -1229,6 +1229,39 @@ class DeviceTest(APIViewTestCases.APIViewTestCase):
self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)
+ def test_rack_fit(self):
+ """
+ Check that creating multiple devices with overlapping position fails.
+ """
+ device = Device.objects.first()
+ device_type = DeviceType.objects.all()[1]
+ data = [
+ {
+ 'device_type': device_type.pk,
+ 'device_role': device.device_role.pk,
+ 'site': device.site.pk,
+ 'name': 'Test Device 7',
+ 'rack': device.rack.pk,
+ 'face': 'front',
+ 'position': 1
+ },
+ {
+ 'device_type': device_type.pk,
+ 'device_role': device.device_role.pk,
+ 'site': device.site.pk,
+ 'name': 'Test Device 8',
+ 'rack': device.rack.pk,
+ 'face': 'front',
+ 'position': 2
+ }
+ ]
+
+ self.add_permissions('dcim.add_device')
+ url = reverse('dcim-api:device-list')
+ response = self.client.post(url, data, format='json', **self.header)
+
+ self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)
+
class ModuleTest(APIViewTestCases.APIViewTestCase):
model = Module
diff --git a/netbox/dcim/tests/test_filtersets.py b/netbox/dcim/tests/test_filtersets.py
index 346b350052..3f9712f2a5 100644
--- a/netbox/dcim/tests/test_filtersets.py
+++ b/netbox/dcim/tests/test_filtersets.py
@@ -12,6 +12,23 @@ from virtualization.models import Cluster, ClusterType
from wireless.choices import WirelessChannelChoices, WirelessRoleChoices
+class DeviceComponentFilterSetTests:
+
+ def test_device_type(self):
+ device_types = DeviceType.objects.all()[:2]
+ params = {'device_type_id': [device_types[0].pk, device_types[1].pk]}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+ params = {'device_type': [device_types[0].model, device_types[1].model]}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+
+ def test_device_role(self):
+ device_role = DeviceRole.objects.all()[:2]
+ params = {'device_role_id': [device_role[0].pk, device_role[1].pk]}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+ params = {'device_role': [device_role[0].slug, device_role[1].slug]}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+
+
class RegionTestCase(TestCase, ChangeLoggedFilterSetTests):
queryset = Region.objects.all()
filterset = RegionFilterSet
@@ -1998,7 +2015,7 @@ class ModuleTestCase(TestCase, ChangeLoggedFilterSetTests):
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
-class ConsolePortTestCase(TestCase, ChangeLoggedFilterSetTests):
+class ConsolePortTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFilterSetTests):
queryset = ConsolePort.objects.all()
filterset = ConsolePortFilterSet
@@ -2027,10 +2044,23 @@ class ConsolePortTestCase(TestCase, ChangeLoggedFilterSetTests):
Site(name='Site 3', slug='site-3', region=regions[2], group=groups[2]),
Site(name='Site X', slug='site-x'),
))
+
manufacturer = Manufacturer.objects.create(name='Manufacturer 1', slug='manufacturer-1')
- device_type = DeviceType.objects.create(manufacturer=manufacturer, model='Device Type 1', slug='device-type-1')
+ device_types = (
+ DeviceType(manufacturer=manufacturer, model='Device Type 1', slug='device-type-1'),
+ DeviceType(manufacturer=manufacturer, model='Device Type 2', slug='device-type-2'),
+ DeviceType(manufacturer=manufacturer, model='Device Type 3', slug='device-type-3'),
+ )
+ DeviceType.objects.bulk_create(device_types)
+
module_type = ModuleType.objects.create(manufacturer=manufacturer, model='Module Type 1')
- device_role = DeviceRole.objects.create(name='Device Role 1', slug='device-role-1')
+
+ device_roles = (
+ DeviceRole(name='Device Role 1', slug='device-role-1'),
+ DeviceRole(name='Device Role 2', slug='device-role-2'),
+ DeviceRole(name='Device Role 3', slug='device-role-3'),
+ )
+ DeviceRole.objects.bulk_create(device_roles)
locations = (
Location(name='Location 1', slug='location-1', site=sites[0]),
@@ -2048,10 +2078,10 @@ class ConsolePortTestCase(TestCase, ChangeLoggedFilterSetTests):
Rack.objects.bulk_create(racks)
devices = (
- Device(name='Device 1', device_type=device_type, device_role=device_role, site=sites[0], location=locations[0], rack=racks[0]),
- Device(name='Device 2', device_type=device_type, device_role=device_role, site=sites[1], location=locations[1], rack=racks[1]),
- Device(name='Device 3', device_type=device_type, device_role=device_role, site=sites[2], location=locations[2], rack=racks[2]),
- Device(name=None, device_type=device_type, device_role=device_role, site=sites[3]), # For cable connections
+ Device(name='Device 1', device_type=device_types[0], device_role=device_roles[0], site=sites[0], location=locations[0], rack=racks[0]),
+ Device(name='Device 2', device_type=device_types[1], device_role=device_roles[1], site=sites[1], location=locations[1], rack=racks[1]),
+ Device(name='Device 3', device_type=device_types[2], device_role=device_roles[2], site=sites[2], location=locations[2], rack=racks[2]),
+ Device(name=None, device_type=device_types[0], device_role=device_roles[0], site=sites[3]), # For cable connections
)
Device.objects.bulk_create(devices)
@@ -2165,7 +2195,7 @@ class ConsolePortTestCase(TestCase, ChangeLoggedFilterSetTests):
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
-class ConsoleServerPortTestCase(TestCase, ChangeLoggedFilterSetTests):
+class ConsoleServerPortTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFilterSetTests):
queryset = ConsoleServerPort.objects.all()
filterset = ConsoleServerPortFilterSet
@@ -2194,10 +2224,23 @@ class ConsoleServerPortTestCase(TestCase, ChangeLoggedFilterSetTests):
Site(name='Site 3', slug='site-3', region=regions[2], group=groups[2]),
Site(name='Site X', slug='site-x'),
))
+
manufacturer = Manufacturer.objects.create(name='Manufacturer 1', slug='manufacturer-1')
- device_type = DeviceType.objects.create(manufacturer=manufacturer, model='Device Type 1', slug='device-type-1')
+ device_types = (
+ DeviceType(manufacturer=manufacturer, model='Device Type 1', slug='device-type-1'),
+ DeviceType(manufacturer=manufacturer, model='Device Type 2', slug='device-type-2'),
+ DeviceType(manufacturer=manufacturer, model='Device Type 3', slug='device-type-3'),
+ )
+ DeviceType.objects.bulk_create(device_types)
+
module_type = ModuleType.objects.create(manufacturer=manufacturer, model='Module Type 1')
- device_role = DeviceRole.objects.create(name='Device Role 1', slug='device-role-1')
+
+ device_roles = (
+ DeviceRole(name='Device Role 1', slug='device-role-1'),
+ DeviceRole(name='Device Role 2', slug='device-role-2'),
+ DeviceRole(name='Device Role 3', slug='device-role-3'),
+ )
+ DeviceRole.objects.bulk_create(device_roles)
locations = (
Location(name='Location 1', slug='location-1', site=sites[0]),
@@ -2215,10 +2258,10 @@ class ConsoleServerPortTestCase(TestCase, ChangeLoggedFilterSetTests):
Rack.objects.bulk_create(racks)
devices = (
- Device(name='Device 1', device_type=device_type, device_role=device_role, site=sites[0], location=locations[0], rack=racks[0]),
- Device(name='Device 2', device_type=device_type, device_role=device_role, site=sites[1], location=locations[1], rack=racks[1]),
- Device(name='Device 3', device_type=device_type, device_role=device_role, site=sites[2], location=locations[2], rack=racks[2]),
- Device(name=None, device_type=device_type, device_role=device_role, site=sites[3]), # For cable connections
+ Device(name='Device 1', device_type=device_types[0], device_role=device_roles[0], site=sites[0], location=locations[0], rack=racks[0]),
+ Device(name='Device 2', device_type=device_types[1], device_role=device_roles[1], site=sites[1], location=locations[1], rack=racks[1]),
+ Device(name='Device 3', device_type=device_types[2], device_role=device_roles[2], site=sites[2], location=locations[2], rack=racks[2]),
+ Device(name=None, device_type=device_types[2], device_role=device_roles[2], site=sites[3]), # For cable connections
)
Device.objects.bulk_create(devices)
@@ -2332,7 +2375,7 @@ class ConsoleServerPortTestCase(TestCase, ChangeLoggedFilterSetTests):
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
-class PowerPortTestCase(TestCase, ChangeLoggedFilterSetTests):
+class PowerPortTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFilterSetTests):
queryset = PowerPort.objects.all()
filterset = PowerPortFilterSet
@@ -2361,10 +2404,23 @@ class PowerPortTestCase(TestCase, ChangeLoggedFilterSetTests):
Site(name='Site 3', slug='site-3', region=regions[2], group=groups[2]),
Site(name='Site X', slug='site-x'),
))
+
manufacturer = Manufacturer.objects.create(name='Manufacturer 1', slug='manufacturer-1')
- device_type = DeviceType.objects.create(manufacturer=manufacturer, model='Device Type 1', slug='device-type-1')
+ device_types = (
+ DeviceType(manufacturer=manufacturer, model='Device Type 1', slug='device-type-1'),
+ DeviceType(manufacturer=manufacturer, model='Device Type 2', slug='device-type-2'),
+ DeviceType(manufacturer=manufacturer, model='Device Type 3', slug='device-type-3'),
+ )
+ DeviceType.objects.bulk_create(device_types)
+
module_type = ModuleType.objects.create(manufacturer=manufacturer, model='Module Type 1')
- device_role = DeviceRole.objects.create(name='Device Role 1', slug='device-role-1')
+
+ device_roles = (
+ DeviceRole(name='Device Role 1', slug='device-role-1'),
+ DeviceRole(name='Device Role 2', slug='device-role-2'),
+ DeviceRole(name='Device Role 3', slug='device-role-3'),
+ )
+ DeviceRole.objects.bulk_create(device_roles)
locations = (
Location(name='Location 1', slug='location-1', site=sites[0]),
@@ -2382,10 +2438,10 @@ class PowerPortTestCase(TestCase, ChangeLoggedFilterSetTests):
Rack.objects.bulk_create(racks)
devices = (
- Device(name='Device 1', device_type=device_type, device_role=device_role, site=sites[0], location=locations[0], rack=racks[0]),
- Device(name='Device 2', device_type=device_type, device_role=device_role, site=sites[1], location=locations[1], rack=racks[1]),
- Device(name='Device 3', device_type=device_type, device_role=device_role, site=sites[2], location=locations[2], rack=racks[2]),
- Device(name=None, device_type=device_type, device_role=device_role, site=sites[3]), # For cable connections
+ Device(name='Device 1', device_type=device_types[0], device_role=device_roles[0], site=sites[0], location=locations[0], rack=racks[0]),
+ Device(name='Device 2', device_type=device_types[1], device_role=device_roles[1], site=sites[1], location=locations[1], rack=racks[1]),
+ Device(name='Device 3', device_type=device_types[2], device_role=device_roles[2], site=sites[2], location=locations[2], rack=racks[2]),
+ Device(name=None, device_type=device_types[2], device_role=device_roles[2], site=sites[3]), # For cable connections
)
Device.objects.bulk_create(devices)
@@ -2507,7 +2563,7 @@ class PowerPortTestCase(TestCase, ChangeLoggedFilterSetTests):
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
-class PowerOutletTestCase(TestCase, ChangeLoggedFilterSetTests):
+class PowerOutletTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFilterSetTests):
queryset = PowerOutlet.objects.all()
filterset = PowerOutletFilterSet
@@ -2536,10 +2592,23 @@ class PowerOutletTestCase(TestCase, ChangeLoggedFilterSetTests):
Site(name='Site 3', slug='site-3', region=regions[2], group=groups[2]),
Site(name='Site X', slug='site-x'),
))
+
manufacturer = Manufacturer.objects.create(name='Manufacturer 1', slug='manufacturer-1')
- device_type = DeviceType.objects.create(manufacturer=manufacturer, model='Device Type 1', slug='device-type-1')
+ device_types = (
+ DeviceType(manufacturer=manufacturer, model='Device Type 1', slug='device-type-1'),
+ DeviceType(manufacturer=manufacturer, model='Device Type 2', slug='device-type-2'),
+ DeviceType(manufacturer=manufacturer, model='Device Type 3', slug='device-type-3'),
+ )
+ DeviceType.objects.bulk_create(device_types)
+
module_type = ModuleType.objects.create(manufacturer=manufacturer, model='Module Type 1')
- device_role = DeviceRole.objects.create(name='Device Role 1', slug='device-role-1')
+
+ device_roles = (
+ DeviceRole(name='Device Role 1', slug='device-role-1'),
+ DeviceRole(name='Device Role 2', slug='device-role-2'),
+ DeviceRole(name='Device Role 3', slug='device-role-3'),
+ )
+ DeviceRole.objects.bulk_create(device_roles)
locations = (
Location(name='Location 1', slug='location-1', site=sites[0]),
@@ -2557,10 +2626,10 @@ class PowerOutletTestCase(TestCase, ChangeLoggedFilterSetTests):
Rack.objects.bulk_create(racks)
devices = (
- Device(name='Device 1', device_type=device_type, device_role=device_role, site=sites[0], location=locations[0], rack=racks[0]),
- Device(name='Device 2', device_type=device_type, device_role=device_role, site=sites[1], location=locations[1], rack=racks[1]),
- Device(name='Device 3', device_type=device_type, device_role=device_role, site=sites[2], location=locations[2], rack=racks[2]),
- Device(name=None, device_type=device_type, device_role=device_role, site=sites[3]), # For cable connections
+ Device(name='Device 1', device_type=device_types[0], device_role=device_roles[0], site=sites[0], location=locations[0], rack=racks[0]),
+ Device(name='Device 2', device_type=device_types[1], device_role=device_roles[1], site=sites[1], location=locations[1], rack=racks[1]),
+ Device(name='Device 3', device_type=device_types[2], device_role=device_roles[2], site=sites[2], location=locations[2], rack=racks[2]),
+ Device(name=None, device_type=device_types[2], device_role=device_roles[2], site=sites[3]), # For cable connections
)
Device.objects.bulk_create(devices)
@@ -2678,7 +2747,7 @@ class PowerOutletTestCase(TestCase, ChangeLoggedFilterSetTests):
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
-class InterfaceTestCase(TestCase, ChangeLoggedFilterSetTests):
+class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFilterSetTests):
queryset = Interface.objects.all()
filterset = InterfaceFilterSet
@@ -2707,10 +2776,23 @@ class InterfaceTestCase(TestCase, ChangeLoggedFilterSetTests):
Site(name='Site 3', slug='site-3', region=regions[2], group=groups[2]),
Site(name='Site X', slug='site-x'),
))
+
manufacturer = Manufacturer.objects.create(name='Manufacturer 1', slug='manufacturer-1')
- device_type = DeviceType.objects.create(manufacturer=manufacturer, model='Device Type 1', slug='device-type-1')
+ device_types = (
+ DeviceType(manufacturer=manufacturer, model='Device Type 1', slug='device-type-1'),
+ DeviceType(manufacturer=manufacturer, model='Device Type 2', slug='device-type-2'),
+ DeviceType(manufacturer=manufacturer, model='Device Type 3', slug='device-type-3'),
+ )
+ DeviceType.objects.bulk_create(device_types)
+
module_type = ModuleType.objects.create(manufacturer=manufacturer, model='Module Type 1')
- device_role = DeviceRole.objects.create(name='Device Role 1', slug='device-role-1')
+
+ device_roles = (
+ DeviceRole(name='Device Role 1', slug='device-role-1'),
+ DeviceRole(name='Device Role 2', slug='device-role-2'),
+ DeviceRole(name='Device Role 3', slug='device-role-3'),
+ )
+ DeviceRole.objects.bulk_create(device_roles)
locations = (
Location(name='Location 1', slug='location-1', site=sites[0]),
@@ -2728,10 +2810,10 @@ class InterfaceTestCase(TestCase, ChangeLoggedFilterSetTests):
Rack.objects.bulk_create(racks)
devices = (
- Device(name='Device 1', device_type=device_type, device_role=device_role, site=sites[0], location=locations[0], rack=racks[0]),
- Device(name='Device 2', device_type=device_type, device_role=device_role, site=sites[1], location=locations[1], rack=racks[1]),
- Device(name='Device 3', device_type=device_type, device_role=device_role, site=sites[2], location=locations[2], rack=racks[2]),
- Device(name=None, device_type=device_type, device_role=device_role, site=sites[3]), # For cable connections
+ Device(name='Device 1', device_type=device_types[0], device_role=device_roles[0], site=sites[0], location=locations[0], rack=racks[0]),
+ Device(name='Device 2', device_type=device_types[1], device_role=device_roles[1], site=sites[1], location=locations[1], rack=racks[1]),
+ Device(name='Device 3', device_type=device_types[2], device_role=device_roles[2], site=sites[2], location=locations[2], rack=racks[2]),
+ Device(name=None, device_type=device_types[2], device_role=device_roles[2], site=sites[3]), # For cable connections
)
Device.objects.bulk_create(devices)
@@ -3101,7 +3183,7 @@ class InterfaceTestCase(TestCase, ChangeLoggedFilterSetTests):
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
-class FrontPortTestCase(TestCase, ChangeLoggedFilterSetTests):
+class FrontPortTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFilterSetTests):
queryset = FrontPort.objects.all()
filterset = FrontPortFilterSet
@@ -3130,10 +3212,23 @@ class FrontPortTestCase(TestCase, ChangeLoggedFilterSetTests):
Site(name='Site 3', slug='site-3', region=regions[2], group=groups[2]),
Site(name='Site X', slug='site-x'),
))
+
manufacturer = Manufacturer.objects.create(name='Manufacturer 1', slug='manufacturer-1')
- device_type = DeviceType.objects.create(manufacturer=manufacturer, model='Device Type 1', slug='device-type-1')
+ device_types = (
+ DeviceType(manufacturer=manufacturer, model='Device Type 1', slug='device-type-1'),
+ DeviceType(manufacturer=manufacturer, model='Device Type 2', slug='device-type-2'),
+ DeviceType(manufacturer=manufacturer, model='Device Type 3', slug='device-type-3'),
+ )
+ DeviceType.objects.bulk_create(device_types)
+
module_type = ModuleType.objects.create(manufacturer=manufacturer, model='Module Type 1')
- device_role = DeviceRole.objects.create(name='Device Role 1', slug='device-role-1')
+
+ device_roles = (
+ DeviceRole(name='Device Role 1', slug='device-role-1'),
+ DeviceRole(name='Device Role 2', slug='device-role-2'),
+ DeviceRole(name='Device Role 3', slug='device-role-3'),
+ )
+ DeviceRole.objects.bulk_create(device_roles)
locations = (
Location(name='Location 1', slug='location-1', site=sites[0]),
@@ -3151,10 +3246,10 @@ class FrontPortTestCase(TestCase, ChangeLoggedFilterSetTests):
Rack.objects.bulk_create(racks)
devices = (
- Device(name='Device 1', device_type=device_type, device_role=device_role, site=sites[0], location=locations[0], rack=racks[0]),
- Device(name='Device 2', device_type=device_type, device_role=device_role, site=sites[1], location=locations[1], rack=racks[1]),
- Device(name='Device 3', device_type=device_type, device_role=device_role, site=sites[2], location=locations[2], rack=racks[2]),
- Device(name=None, device_type=device_type, device_role=device_role, site=sites[3]), # For cable connections
+ Device(name='Device 1', device_type=device_types[0], device_role=device_roles[0], site=sites[0], location=locations[0], rack=racks[0]),
+ Device(name='Device 2', device_type=device_types[1], device_role=device_roles[1], site=sites[1], location=locations[1], rack=racks[1]),
+ Device(name='Device 3', device_type=device_types[2], device_role=device_roles[2], site=sites[2], location=locations[2], rack=racks[2]),
+ Device(name=None, device_type=device_types[2], device_role=device_roles[2], site=sites[3]), # For cable connections
)
Device.objects.bulk_create(devices)
@@ -3277,7 +3372,7 @@ class FrontPortTestCase(TestCase, ChangeLoggedFilterSetTests):
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
-class RearPortTestCase(TestCase, ChangeLoggedFilterSetTests):
+class RearPortTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFilterSetTests):
queryset = RearPort.objects.all()
filterset = RearPortFilterSet
@@ -3306,10 +3401,23 @@ class RearPortTestCase(TestCase, ChangeLoggedFilterSetTests):
Site(name='Site 3', slug='site-3', region=regions[2], group=groups[2]),
Site(name='Site X', slug='site-x'),
))
+
manufacturer = Manufacturer.objects.create(name='Manufacturer 1', slug='manufacturer-1')
- device_type = DeviceType.objects.create(manufacturer=manufacturer, model='Device Type 1', slug='device-type-1')
+ device_types = (
+ DeviceType(manufacturer=manufacturer, model='Device Type 1', slug='device-type-1'),
+ DeviceType(manufacturer=manufacturer, model='Device Type 2', slug='device-type-2'),
+ DeviceType(manufacturer=manufacturer, model='Device Type 3', slug='device-type-3'),
+ )
+ DeviceType.objects.bulk_create(device_types)
+
module_type = ModuleType.objects.create(manufacturer=manufacturer, model='Module Type 1')
- device_role = DeviceRole.objects.create(name='Device Role 1', slug='device-role-1')
+
+ device_roles = (
+ DeviceRole(name='Device Role 1', slug='device-role-1'),
+ DeviceRole(name='Device Role 2', slug='device-role-2'),
+ DeviceRole(name='Device Role 3', slug='device-role-3'),
+ )
+ DeviceRole.objects.bulk_create(device_roles)
locations = (
Location(name='Location 1', slug='location-1', site=sites[0]),
@@ -3327,10 +3435,10 @@ class RearPortTestCase(TestCase, ChangeLoggedFilterSetTests):
Rack.objects.bulk_create(racks)
devices = (
- Device(name='Device 1', device_type=device_type, device_role=device_role, site=sites[0], location=locations[0], rack=racks[0]),
- Device(name='Device 2', device_type=device_type, device_role=device_role, site=sites[1], location=locations[1], rack=racks[1]),
- Device(name='Device 3', device_type=device_type, device_role=device_role, site=sites[2], location=locations[2], rack=racks[2]),
- Device(name=None, device_type=device_type, device_role=device_role, site=sites[3]), # For cable connections
+ Device(name='Device 1', device_type=device_types[0], device_role=device_roles[0], site=sites[0], location=locations[0], rack=racks[0]),
+ Device(name='Device 2', device_type=device_types[1], device_role=device_roles[1], site=sites[1], location=locations[1], rack=racks[1]),
+ Device(name='Device 3', device_type=device_types[2], device_role=device_roles[2], site=sites[2], location=locations[2], rack=racks[2]),
+ Device(name=None, device_type=device_types[2], device_role=device_roles[2], site=sites[3]), # For cable connections
)
Device.objects.bulk_create(devices)
@@ -3447,7 +3555,7 @@ class RearPortTestCase(TestCase, ChangeLoggedFilterSetTests):
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
-class ModuleBayTestCase(TestCase, ChangeLoggedFilterSetTests):
+class ModuleBayTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFilterSetTests):
queryset = ModuleBay.objects.all()
filterset = ModuleBayFilterSet
@@ -3476,9 +3584,21 @@ class ModuleBayTestCase(TestCase, ChangeLoggedFilterSetTests):
Site(name='Site 3', slug='site-3', region=regions[2], group=groups[2]),
Site(name='Site X', slug='site-x'),
))
+
manufacturer = Manufacturer.objects.create(name='Manufacturer 1', slug='manufacturer-1')
- device_type = DeviceType.objects.create(manufacturer=manufacturer, model='Model 1', slug='model-1')
- device_role = DeviceRole.objects.create(name='Device Role 1', slug='device-role-1')
+ device_types = (
+ DeviceType(manufacturer=manufacturer, model='Device Type 1', slug='device-type-1'),
+ DeviceType(manufacturer=manufacturer, model='Device Type 2', slug='device-type-2'),
+ DeviceType(manufacturer=manufacturer, model='Device Type 3', slug='device-type-3'),
+ )
+ DeviceType.objects.bulk_create(device_types)
+
+ device_roles = (
+ DeviceRole(name='Device Role 1', slug='device-role-1'),
+ DeviceRole(name='Device Role 2', slug='device-role-2'),
+ DeviceRole(name='Device Role 3', slug='device-role-3'),
+ )
+ DeviceRole.objects.bulk_create(device_roles)
locations = (
Location(name='Location 1', slug='location-1', site=sites[0]),
@@ -3496,9 +3616,9 @@ class ModuleBayTestCase(TestCase, ChangeLoggedFilterSetTests):
Rack.objects.bulk_create(racks)
devices = (
- Device(name='Device 1', device_type=device_type, device_role=device_role, site=sites[0], location=locations[0], rack=racks[0]),
- Device(name='Device 2', device_type=device_type, device_role=device_role, site=sites[1], location=locations[1], rack=racks[1]),
- Device(name='Device 3', device_type=device_type, device_role=device_role, site=sites[2], location=locations[2], rack=racks[2]),
+ Device(name='Device 1', device_type=device_types[0], device_role=device_roles[0], site=sites[0], location=locations[0], rack=racks[0]),
+ Device(name='Device 2', device_type=device_types[1], device_role=device_roles[1], site=sites[1], location=locations[1], rack=racks[1]),
+ Device(name='Device 3', device_type=device_types[2], device_role=device_roles[2], site=sites[2], location=locations[2], rack=racks[2]),
)
Device.objects.bulk_create(devices)
@@ -3564,7 +3684,7 @@ class ModuleBayTestCase(TestCase, ChangeLoggedFilterSetTests):
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
-class DeviceBayTestCase(TestCase, ChangeLoggedFilterSetTests):
+class DeviceBayTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFilterSetTests):
queryset = DeviceBay.objects.all()
filterset = DeviceBayFilterSet
@@ -3593,9 +3713,21 @@ class DeviceBayTestCase(TestCase, ChangeLoggedFilterSetTests):
Site(name='Site 3', slug='site-3', region=regions[2], group=groups[2]),
Site(name='Site X', slug='site-x'),
))
+
manufacturer = Manufacturer.objects.create(name='Manufacturer 1', slug='manufacturer-1')
- device_type = DeviceType.objects.create(manufacturer=manufacturer, model='Model 1', slug='model-1')
- device_role = DeviceRole.objects.create(name='Device Role 1', slug='device-role-1')
+ device_types = (
+ DeviceType(manufacturer=manufacturer, model='Device Type 1', slug='device-type-1'),
+ DeviceType(manufacturer=manufacturer, model='Device Type 2', slug='device-type-2'),
+ DeviceType(manufacturer=manufacturer, model='Device Type 3', slug='device-type-3'),
+ )
+ DeviceType.objects.bulk_create(device_types)
+
+ device_roles = (
+ DeviceRole(name='Device Role 1', slug='device-role-1'),
+ DeviceRole(name='Device Role 2', slug='device-role-2'),
+ DeviceRole(name='Device Role 3', slug='device-role-3'),
+ )
+ DeviceRole.objects.bulk_create(device_roles)
locations = (
Location(name='Location 1', slug='location-1', site=sites[0]),
@@ -3613,9 +3745,9 @@ class DeviceBayTestCase(TestCase, ChangeLoggedFilterSetTests):
Rack.objects.bulk_create(racks)
devices = (
- Device(name='Device 1', device_type=device_type, device_role=device_role, site=sites[0], location=locations[0], rack=racks[0]),
- Device(name='Device 2', device_type=device_type, device_role=device_role, site=sites[1], location=locations[1], rack=racks[1]),
- Device(name='Device 3', device_type=device_type, device_role=device_role, site=sites[2], location=locations[2], rack=racks[2]),
+ Device(name='Device 1', device_type=device_types[0], device_role=device_roles[0], site=sites[0], location=locations[0], rack=racks[0]),
+ Device(name='Device 2', device_type=device_types[1], device_role=device_roles[1], site=sites[1], location=locations[1], rack=racks[1]),
+ Device(name='Device 3', device_type=device_types[2], device_role=device_roles[2], site=sites[2], location=locations[2], rack=racks[2]),
)
Device.objects.bulk_create(devices)
@@ -3694,8 +3826,19 @@ class InventoryItemTestCase(TestCase, ChangeLoggedFilterSetTests):
)
Manufacturer.objects.bulk_create(manufacturers)
- device_type = DeviceType.objects.create(manufacturer=manufacturers[0], model='Model 1', slug='model-1')
- device_role = DeviceRole.objects.create(name='Device Role 1', slug='device-role-1')
+ device_types = (
+ DeviceType(manufacturer=manufacturers[0], model='Device Type 1', slug='device-type-1'),
+ DeviceType(manufacturer=manufacturers[0], model='Device Type 2', slug='device-type-2'),
+ DeviceType(manufacturer=manufacturers[0], model='Device Type 3', slug='device-type-3'),
+ )
+ DeviceType.objects.bulk_create(device_types)
+
+ device_roles = (
+ DeviceRole(name='Device Role 1', slug='device-role-1'),
+ DeviceRole(name='Device Role 2', slug='device-role-2'),
+ DeviceRole(name='Device Role 3', slug='device-role-3'),
+ )
+ DeviceRole.objects.bulk_create(device_roles)
regions = (
Region(name='Region 1', slug='region-1'),
@@ -3736,9 +3879,9 @@ class InventoryItemTestCase(TestCase, ChangeLoggedFilterSetTests):
Rack.objects.bulk_create(racks)
devices = (
- Device(name='Device 1', device_type=device_type, device_role=device_role, site=sites[0], location=locations[0], rack=racks[0]),
- Device(name='Device 2', device_type=device_type, device_role=device_role, site=sites[1], location=locations[1], rack=racks[1]),
- Device(name='Device 3', device_type=device_type, device_role=device_role, site=sites[2], location=locations[2], rack=racks[2]),
+ Device(name='Device 1', device_type=device_types[0], device_role=device_roles[0], site=sites[0], location=locations[0], rack=racks[0]),
+ Device(name='Device 2', device_type=device_types[1], device_role=device_roles[1], site=sites[1], location=locations[1], rack=racks[1]),
+ Device(name='Device 3', device_type=device_types[2], device_role=device_roles[2], site=sites[2], location=locations[2], rack=racks[2]),
)
Device.objects.bulk_create(devices)
@@ -3829,6 +3972,20 @@ class InventoryItemTestCase(TestCase, ChangeLoggedFilterSetTests):
params = {'rack': [racks[0].name, racks[1].name]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
+ def test_device_type(self):
+ device_types = DeviceType.objects.all()[:2]
+ params = {'device_type_id': [device_types[0].pk, device_types[1].pk]}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
+ params = {'device_type': [device_types[0].model, device_types[1].model]}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
+
+ def test_device_role(self):
+ device_role = DeviceRole.objects.all()[:2]
+ params = {'device_role_id': [device_role[0].pk, device_role[1].pk]}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
+ params = {'device_role': [device_role[0].slug, device_role[1].slug]}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
+
def test_device(self):
devices = Device.objects.all()[:2]
params = {'device_id': [devices[0].pk, devices[1].pk]}
diff --git a/netbox/extras/choices.py b/netbox/extras/choices.py
index e10516c4ca..6fc14b9658 100644
--- a/netbox/extras/choices.py
+++ b/netbox/extras/choices.py
@@ -56,11 +56,13 @@ class CustomFieldVisibilityChoices(ChoiceSet):
VISIBILITY_READ_WRITE = 'read-write'
VISIBILITY_READ_ONLY = 'read-only'
VISIBILITY_HIDDEN = 'hidden'
+ VISIBILITY_HIDDEN_IFUNSET = 'hidden-ifunset'
CHOICES = (
(VISIBILITY_READ_WRITE, 'Read/Write'),
(VISIBILITY_READ_ONLY, 'Read-only'),
(VISIBILITY_HIDDEN, 'Hidden'),
+ (VISIBILITY_HIDDEN_IFUNSET, 'Hidden (if unset)'),
)
diff --git a/netbox/extras/conditions.py b/netbox/extras/conditions.py
index c6744e524b..db054149ef 100644
--- a/netbox/extras/conditions.py
+++ b/netbox/extras/conditions.py
@@ -65,8 +65,14 @@ class Condition:
"""
Evaluate the provided data to determine whether it matches the condition.
"""
+ def _get(obj, key):
+ if isinstance(obj, list):
+ return [dict.get(i, key) for i in obj]
+
+ return dict.get(obj, key)
+
try:
- value = functools.reduce(dict.get, self.attr.split('.'), data)
+ value = functools.reduce(_get, self.attr.split('.'), data)
except TypeError:
# Invalid key path
value = None
diff --git a/netbox/extras/dashboard/widgets.py b/netbox/extras/dashboard/widgets.py
index dc68e13880..b3a4d090c6 100644
--- a/netbox/extras/dashboard/widgets.py
+++ b/netbox/extras/dashboard/widgets.py
@@ -10,8 +10,9 @@ from django.conf import settings
from django.contrib.contenttypes.models import ContentType
from django.core.cache import cache
from django.db.models import Q
+from django.http import QueryDict
from django.template.loader import render_to_string
-from django.urls import NoReverseMatch, reverse
+from django.urls import NoReverseMatch, resolve, reverse
from django.utils.translation import gettext as _
from extras.utils import FeatureQuery
@@ -149,7 +150,7 @@ class ObjectCountsWidget(DashboardWidget):
filters = forms.JSONField(
required=False,
label='Object filters',
- help_text=_("Only objects matching the specified filters will be counted")
+ help_text=_("Filters to apply when counting the number of objects")
)
def clean_filters(self):
@@ -158,13 +159,6 @@ class ObjectCountsWidget(DashboardWidget):
dict(data)
except TypeError:
raise forms.ValidationError("Invalid format. Object filters must be passed as a dictionary.")
- for model in get_models_from_content_types(self.cleaned_data.get('models')):
- try:
- # Validate the filters by creating a QuerySet
- model.objects.filter(**data).none()
- except Exception:
- model_name = model._meta.verbose_name_plural
- raise forms.ValidationError(f"Invalid filter specification for {model_name}.")
return data
def render(self, request):
@@ -172,13 +166,19 @@ class ObjectCountsWidget(DashboardWidget):
for model in get_models_from_content_types(self.config['models']):
permission = get_permission_for_model(model, 'view')
if request.user.has_perm(permission):
+ url = reverse(get_viewname(model, 'list'))
qs = model.objects.restrict(request.user, 'view')
+ # Apply any specified filters
if filters := self.config.get('filters'):
- qs = qs.filter(**filters)
+ params = QueryDict(mutable=True)
+ params.update(filters)
+ filterset = getattr(resolve(url).func.view_class, 'filterset', None)
+ qs = filterset(params, qs).qs
+ url = f'{url}?{params.urlencode()}'
object_count = qs.count
- counts.append((model, object_count))
+ counts.append((model, object_count, url))
else:
- counts.append((model, None))
+ counts.append((model, None, None))
return render_to_string(self.template_name, {
'counts': counts,
diff --git a/netbox/extras/lookups.py b/netbox/extras/lookups.py
index 77fe2301e3..a8d89c943c 100644
--- a/netbox/extras/lookups.py
+++ b/netbox/extras/lookups.py
@@ -7,12 +7,14 @@ class Empty(Lookup):
Filter on whether a string is empty.
"""
lookup_name = 'empty'
+ prepare_rhs = False
- def as_sql(self, qn, connection):
- lhs, lhs_params = self.process_lhs(qn, connection)
- rhs, rhs_params = self.process_rhs(qn, connection)
- params = lhs_params + rhs_params
- return 'CAST(LENGTH(%s) AS BOOLEAN) != %s' % (lhs, rhs), params
+ def as_sql(self, compiler, connection):
+ sql, params = compiler.compile(self.lhs)
+ if self.rhs:
+ return f"CAST(LENGTH({sql}) AS BOOLEAN) IS NOT TRUE", params
+ else:
+ return f"CAST(LENGTH({sql}) AS BOOLEAN) IS TRUE", params
class NetContainsOrEquals(Lookup):
diff --git a/netbox/extras/models/models.py b/netbox/extras/models/models.py
index 16e4fb577f..9433ab6b0a 100644
--- a/netbox/extras/models/models.py
+++ b/netbox/extras/models/models.py
@@ -274,10 +274,10 @@ class CustomLink(CloningMixin, ExportTemplatesMixin, ChangeLoggedModel):
:param context: The context passed to Jinja2
"""
- text = render_jinja2(self.link_text, context)
+ text = render_jinja2(self.link_text, context).strip()
if not text:
return {}
- link = render_jinja2(self.link_url, context)
+ link = render_jinja2(self.link_url, context).strip()
link_target = ' target="_blank"' if self.new_window else ''
# Sanitize link text
diff --git a/netbox/extras/tables/tables.py b/netbox/extras/tables/tables.py
index 8d046b85d0..9e49245326 100644
--- a/netbox/extras/tables/tables.py
+++ b/netbox/extras/tables/tables.py
@@ -22,6 +22,14 @@ __all__ = (
'WebhookTable',
)
+IMAGEATTACHMENT_IMAGE = '''
+{% if record.image %}
+ {{ record }}
+{% else %}
+ —
+{% endif %}
+'''
+
class CustomFieldTable(NetBoxTable):
name = tables.Column(
@@ -96,6 +104,9 @@ class ImageAttachmentTable(NetBoxTable):
parent = tables.Column(
linkify=True
)
+ image = tables.TemplateColumn(
+ template_code=IMAGEATTACHMENT_IMAGE,
+ )
size = tables.Column(
orderable=False,
verbose_name='Size (bytes)'
diff --git a/netbox/ipam/forms/model_forms.py b/netbox/ipam/forms/model_forms.py
index ac75e2cc30..eb6dbe598e 100644
--- a/netbox/ipam/forms/model_forms.py
+++ b/netbox/ipam/forms/model_forms.py
@@ -328,6 +328,12 @@ class IPAddressForm(TenancyForm, NetBoxModelForm):
):
self.initial['primary_for_parent'] = True
+ # Disable object assignment fields if the IP address is designated as primary
+ if self.initial.get('primary_for_parent'):
+ self.fields['interface'].disabled = True
+ self.fields['vminterface'].disabled = True
+ self.fields['fhrpgroup'].disabled = True
+
def clean(self):
super().clean()
@@ -340,7 +346,12 @@ class IPAddressForm(TenancyForm, NetBoxModelForm):
selected_objects[1]: "An IP address can only be assigned to a single object."
})
elif selected_objects:
- self.instance.assigned_object = self.cleaned_data[selected_objects[0]]
+ assigned_object = self.cleaned_data[selected_objects[0]]
+ if self.cleaned_data['primary_for_parent'] and assigned_object != self.instance.assigned_object:
+ raise ValidationError(
+ "Cannot reassign IP address while it is designated as the primary IP for the parent object"
+ )
+ self.instance.assigned_object = assigned_object
else:
self.instance.assigned_object = None
diff --git a/netbox/netbox/api/viewsets/mixins.py b/netbox/netbox/api/viewsets/mixins.py
index 8b629bbc67..fde486fe96 100644
--- a/netbox/netbox/api/viewsets/mixins.py
+++ b/netbox/netbox/api/viewsets/mixins.py
@@ -15,11 +15,12 @@ from utilities.api import get_serializer_for_model
__all__ = (
'BriefModeMixin',
+ 'BulkDestroyModelMixin',
'BulkUpdateModelMixin',
'CustomFieldsMixin',
'ExportTemplatesMixin',
- 'BulkDestroyModelMixin',
'ObjectValidationMixin',
+ 'SequentialBulkCreatesMixin',
)
@@ -94,6 +95,30 @@ class ExportTemplatesMixin:
return super().list(request, *args, **kwargs)
+class SequentialBulkCreatesMixin:
+ """
+ Perform bulk creation of new objects sequentially, rather than all at once. This ensures that any validation
+ which depends on the evaluation of existing objects (such as checking for free space within a rack) functions
+ appropriately.
+ """
+ @transaction.atomic
+ def create(self, request, *args, **kwargs):
+ if not isinstance(request.data, list):
+ # Creating a single object
+ return super().create(request, *args, **kwargs)
+
+ return_data = []
+ for data in request.data:
+ serializer = self.get_serializer(data=data)
+ serializer.is_valid(raise_exception=True)
+ self.perform_create(serializer)
+ return_data.append(serializer.data)
+
+ headers = self.get_success_headers(serializer.data)
+
+ return Response(return_data, status=status.HTTP_201_CREATED, headers=headers)
+
+
class BulkUpdateModelMixin:
"""
Support bulk modification of objects using the list endpoint for a model. Accepts a PATCH action with a list of one
diff --git a/netbox/netbox/filtersets.py b/netbox/netbox/filtersets.py
index a0c1edee88..9a2385c453 100644
--- a/netbox/netbox/filtersets.py
+++ b/netbox/netbox/filtersets.py
@@ -177,7 +177,8 @@ class BaseFilterSet(django_filters.FilterSet):
# create the new filter with the same type because there is no guarantee the defined type
# is the same as the default type for the field
resolve_field(field, lookup_expr) # Will raise FieldLookupError if the lookup is invalid
- new_filter = type(existing_filter)(
+ filter_cls = django_filters.BooleanFilter if lookup_expr == 'empty' else type(existing_filter)
+ new_filter = filter_cls(
field_name=field_name,
lookup_expr=lookup_expr,
label=existing_filter.label,
@@ -224,6 +225,14 @@ class BaseFilterSet(django_filters.FilterSet):
return filters
+ @classmethod
+ def filter_for_lookup(cls, field, lookup_type):
+
+ if lookup_type == 'empty':
+ return django_filters.BooleanFilter, {}
+
+ return super().filter_for_lookup(field, lookup_type)
+
class ChangeLoggedModelFilterSet(BaseFilterSet):
"""
diff --git a/netbox/netbox/models/features.py b/netbox/netbox/models/features.py
index 6d82e2a2be..8bacba5345 100644
--- a/netbox/netbox/models/features.py
+++ b/netbox/netbox/models/features.py
@@ -197,11 +197,15 @@ class CustomFieldsMixin(models.Model):
data = {}
for field in CustomField.objects.get_for_model(self):
- # Skip fields that are hidden if 'omit_hidden' is set
- if omit_hidden and field.ui_visibility == CustomFieldVisibilityChoices.VISIBILITY_HIDDEN:
- continue
-
value = self.custom_field_data.get(field.name)
+
+ # Skip fields that are hidden if 'omit_hidden' is set
+ if omit_hidden:
+ if field.ui_visibility == CustomFieldVisibilityChoices.VISIBILITY_HIDDEN:
+ continue
+ if field.ui_visibility == CustomFieldVisibilityChoices.VISIBILITY_HIDDEN_IFUNSET and not value:
+ continue
+
data[field] = field.deserialize(value)
return data
@@ -227,6 +231,8 @@ class CustomFieldsMixin(models.Model):
for cf in visible_custom_fields:
value = self.custom_field_data.get(cf.name)
+ if value in (None, []) and cf.ui_visibility == CustomFieldVisibilityChoices.VISIBILITY_HIDDEN_IFUNSET:
+ continue
value = cf.deserialize(value)
groups[cf.group_name][cf] = value
diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index a5923c9f0b..4e27e59a40 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.2'
+VERSION = '3.5.3'
# Hostname
HOSTNAME = platform.node()
diff --git a/netbox/netbox/tables/columns.py b/netbox/netbox/tables/columns.py
index 66ee787a8f..9ef3270262 100644
--- a/netbox/netbox/tables/columns.py
+++ b/netbox/netbox/tables/columns.py
@@ -234,8 +234,12 @@ class ActionsColumn(tables.Column):
return ''
model = table.Meta.model
- request = getattr(table, 'context', {}).get('request')
- url_appendix = f'?return_url={quote(request.get_full_path())}' if request else ''
+ if request := getattr(table, 'context', {}).get('request'):
+ return_url = request.GET.get('return_url', request.get_full_path())
+ url_appendix = f'?return_url={quote(return_url)}'
+ else:
+ url_appendix = ''
+
html = ''
# Compile actions menu
diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js
index 8caaaa9a06..9642d15851 100644
--- a/netbox/project-static/dist/netbox.js
+++ b/netbox/project-static/dist/netbox.js
@@ -1,22 +1,23 @@
-(()=>{var bw=Object.create;var ea=Object.defineProperty,yw=Object.defineProperties,Ew=Object.getOwnPropertyDescriptor,_w=Object.getOwnPropertyDescriptors,ww=Object.getOwnPropertyNames,eh=Object.getOwnPropertySymbols,xw=Object.getPrototypeOf,th=Object.prototype.hasOwnProperty,Sw=Object.prototype.propertyIsEnumerable;var iu=(ii,ti,ei)=>ti in ii?ea(ii,ti,{enumerable:!0,configurable:!0,writable:!0,value:ei}):ii[ti]=ei,Vi=(ii,ti)=>{for(var ei in ti||(ti={}))th.call(ti,ei)&&iu(ii,ei,ti[ei]);if(eh)for(var ei of eh(ti))Sw.call(ti,ei)&&iu(ii,ei,ti[ei]);return ii},rl=(ii,ti)=>yw(ii,_w(ti)),ih=ii=>ea(ii,"__esModule",{value:!0});var _i=(ii,ti)=>()=>(ti||ii((ti={exports:{}}).exports,ti),ti.exports),Tw=(ii,ti)=>{ih(ii);for(var ei in ti)ea(ii,ei,{get:ti[ei],enumerable:!0})},Ow=(ii,ti,ei)=>{if(ti&&typeof ti=="object"||typeof ti=="function")for(let ri of ww(ti))!th.call(ii,ri)&&ri!=="default"&&ea(ii,ri,{get:()=>ti[ri],enumerable:!(ei=Ew(ti,ri))||ei.enumerable});return ii},Ln=ii=>Ow(ih(ea(ii!=null?bw(xw(ii)):{},"default",ii&&ii.__esModule&&"default"in ii?{get:()=>ii.default,enumerable:!0}:{value:ii,enumerable:!0})),ii);var Yi=(ii,ti,ei)=>(iu(ii,typeof ti!="symbol"?ti+"":ti,ei),ei);var Fr=(ii,ti,ei)=>new Promise((ri,ni)=>{var si=li=>{try{ai(ei.next(li))}catch(ci){ni(ci)}},oi=li=>{try{ai(ei.throw(li))}catch(ci){ni(ci)}},ai=li=>li.done?ri(li.value):Promise.resolve(li.value).then(si,oi);ai((ei=ei.apply(ii,ti)).next())});var Hp=_i((exports,module)=>{(function(ii,ti){typeof define=="function"&&define.amd?define([],ti):ii.htmx=ii.htmx||ti()})(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(ii,ti){var ei=Pt(ii,ti||"post");return ei.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(ii){return new EventSource(ii,{withCredentials:!0})},createWebSocket:function(ii){return new WebSocket(ii,[])},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(ii){return"[hx-"+ii+"], [data-hx-"+ii+"]"}).join(", ");function v(ii){if(ii!=null)return ii.slice(-2)=="ms"?parseFloat(ii.slice(0,-2))||void 0:ii.slice(-1)=="s"?parseFloat(ii.slice(0,-1))*1e3||void 0:ii.slice(-1)=="m"?parseFloat(ii.slice(0,-1))*1e3*60||void 0:parseFloat(ii)||void 0}function f(ii,ti){return ii.getAttribute&&ii.getAttribute(ti)}function o(ii,ti){return ii.hasAttribute&&(ii.hasAttribute(ti)||ii.hasAttribute("data-"+ti))}function V(ii,ti){return f(ii,ti)||f(ii,"data-"+ti)}function u(ii){return ii.parentElement}function _(){return document}function h(ii,ti){for(;ii&&!ti(ii);)ii=u(ii);return ii||null}function a(ii,ti,ei){var ri=V(ti,ei),ni=V(ti,"hx-disinherit");return ii!==ti&&ni&&(ni==="*"||ni.split(" ").indexOf(ei)>=0)?"unset":ri}function z(ii,ti){var ei=null;if(h(ii,function(ri){return ei=a(ii,ri,ti)}),ei!=="unset")return ei}function d(ii,ti){var ei=ii.matches||ii.matchesSelector||ii.msMatchesSelector||ii.mozMatchesSelector||ii.webkitMatchesSelector||ii.oMatchesSelector;return ei&&ei.call(ii,ti)}function s(ii){var ti=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,ei=ti.exec(ii);return ei?ei[1].toLowerCase():""}function l(ii,ti){for(var ei=new DOMParser,ri=ei.parseFromString(ii,"text/html"),ni=ri.body;ti>0;)ti--,ni=ni.firstChild;return ni==null&&(ni=_().createDocumentFragment()),ni}function g(ii){if(U.config.useTemplateFragments){var ti=l(""+ii+"",0);return ti.querySelector("template").content}else{var ei=s(ii);switch(ei){case"thead":case"tbody":case"tfoot":case"colgroup":case"caption":return l(""+ii+"
",1);default:return l(ii,0)}}}function Z(ii){ii&&ii()}function p(ii,ti){return Object.prototype.toString.call(ii)==="[object "+ti+"]"}function m(ii){return p(ii,"Function")}function x(ii){return p(ii,"Object")}function W(ii){var ti="htmx-internal-data",ei=ii[ti];return ei||(ei=ii[ti]={}),ei}function y(ii){var ti=[];if(ii)for(var ei=0;ei${ai}
',trigger:"hover focus",title:"",delay:0,html:!1,selector:!1,placement:"top",offset:[0,0],container:!1,fallbackPlacements:["top","right","bottom","left"],boundary:"clippingParents",customClass:"",sanitize:!0,sanitizeFn:null,allowList:_T,popperConfig:null},CT={HIDE:`hide${Hn}`,HIDDEN:`hidden${Hn}`,SHOW:`show${Hn}`,SHOWN:`shown${Hn}`,INSERTED:`inserted${Hn}`,CLICK:`click${Hn}`,FOCUSIN:`focusin${Hn}`,FOCUSOUT:`focusout${Hn}`,MOUSEENTER:`mouseenter${Hn}`,MOUSELEAVE:`mouseleave${Hn}`},Tl="fade",wp="modal",ga="show",va="show",Nu="out",AT=".tooltip-inner",ba="hover",ku="focus",LT="click",MT="manual",qn=class extends _n{constructor(ti,ei){if(typeof pl=="undefined")throw new TypeError("Bootstrap's tooltips require Popper (https://popper.js.org)");super(ti);this._isEnabled=!0,this._timeout=0,this._hoverState="",this._activeTrigger={},this._popper=null,this._config=this._getConfig(ei),this.tip=null,this._setListeners()}static get Default(){return DT}static get NAME(){return Ep}static get Event(){return CT}static get DefaultType(){return TT}enable(){this._isEnabled=!0}disable(){this._isEnabled=!1}toggleEnabled(){this._isEnabled=!this._isEnabled}toggle(ti){if(!!this._isEnabled)if(ti){let ei=this._initializeOnDelegatedTarget(ti);ei._activeTrigger.click=!ei._activeTrigger.click,ei._isWithActiveTrigger()?ei._enter(null,ei):ei._leave(null,ei)}else{if(this.getTipElement().classList.contains(ga)){this._leave(null,this);return}this._enter(null,this)}}dispose(){clearTimeout(this._timeout),Ti.off(this._element.closest(`.${wp}`),"hide.bs.modal",this._hideModalHandler),this.tip&&this.tip.remove(),this._popper&&this._popper.destroy(),super.dispose()}show(){if(this._element.style.display==="none")throw new Error("Please use show on visible elements");if(!(this.isWithContent()&&this._isEnabled))return;let ti=Ti.trigger(this._element,this.constructor.Event.SHOW),ei=Th(this._element),ri=ei===null?this._element.ownerDocument.documentElement.contains(this._element):ei.contains(this._element);if(ti.defaultPrevented||!ri)return;let ni=this.getTipElement(),si=wh(this.constructor.NAME);ni.setAttribute("id",si),this._element.setAttribute("aria-describedby",si),this.setContent(),this._config.animation&&ni.classList.add(Tl);let oi=typeof this._config.placement=="function"?this._config.placement.call(this,ni,this._element):this._config.placement,ai=this._getAttachment(oi);this._addAttachmentClass(ai);let{container:li}=this._config;qs.set(ni,this.constructor.DATA_KEY,this),this._element.ownerDocument.documentElement.contains(this.tip)||(li.appendChild(ni),Ti.trigger(this._element,this.constructor.Event.INSERTED)),this._popper?this._popper.update():this._popper=hl(this._element,ni,this._getPopperConfig(ai)),ni.classList.add(ga);let ci=typeof this._config.customClass=="function"?this._config.customClass():this._config.customClass;ci&&ni.classList.add(...ci.split(" ")),"ontouchstart"in document.documentElement&&[].concat(...document.body.children).forEach(di=>{Ti.on(di,"mouseover",gl)});let ui=()=>{let di=this._hoverState;this._hoverState=null,Ti.trigger(this._element,this.constructor.Event.SHOWN),di===Nu&&this._leave(null,this)},fi=this.tip.classList.contains(Tl);this._queueCallback(ui,this.tip,fi)}hide(){if(!this._popper)return;let ti=this.getTipElement(),ei=()=>{this._isWithActiveTrigger()||(this._hoverState!==va&&ti.remove(),this._cleanTipClass(),this._element.removeAttribute("aria-describedby"),Ti.trigger(this._element,this.constructor.Event.HIDDEN),this._popper&&(this._popper.destroy(),this._popper=null))};if(Ti.trigger(this._element,this.constructor.Event.HIDE).defaultPrevented)return;ti.classList.remove(ga),"ontouchstart"in document.documentElement&&[].concat(...document.body.children).forEach(si=>Ti.off(si,"mouseover",gl)),this._activeTrigger[LT]=!1,this._activeTrigger[ku]=!1,this._activeTrigger[ba]=!1;let ni=this.tip.classList.contains(Tl);this._queueCallback(ei,this.tip,ni),this._hoverState=""}update(){this._popper!==null&&this._popper.update()}isWithContent(){return Boolean(this.getTitle())}getTipElement(){if(this.tip)return this.tip;let ti=document.createElement("div");return ti.innerHTML=this._config.template,this.tip=ti.children[0],this.tip}setContent(){let ti=this.getTipElement();this.setElementContent(Ui.findOne(AT,ti),this.getTitle()),ti.classList.remove(Tl,ga)}setElementContent(ti,ei){if(ti!==null){if(ds(ei)){ei=To(ei),this._config.html?ei.parentNode!==ti&&(ti.innerHTML="",ti.appendChild(ei)):ti.textContent=ei.textContent;return}this._config.html?(this._config.sanitize&&(ei=yp(ei,this._config.allowList,this._config.sanitizeFn)),ti.innerHTML=ei):ti.textContent=ei}}getTitle(){let ti=this._element.getAttribute("data-bs-original-title");return ti||(ti=typeof this._config.title=="function"?this._config.title.call(this._element):this._config.title),ti}updateAttachment(ti){return ti==="right"?"end":ti==="left"?"start":ti}_initializeOnDelegatedTarget(ti,ei){let ri=this.constructor.DATA_KEY;return ei=ei||qs.get(ti.delegateTarget,ri),ei||(ei=new this.constructor(ti.delegateTarget,this._getDelegateConfig()),qs.set(ti.delegateTarget,ri,ei)),ei}_getOffset(){let{offset:ti}=this._config;return typeof ti=="string"?ti.split(",").map(ei=>Number.parseInt(ei,10)):typeof ti=="function"?ei=>ti(ei,this._element):ti}_getPopperConfig(ti){let ei={placement:ti,modifiers:[{name:"flip",options:{fallbackPlacements:this._config.fallbackPlacements}},{name:"offset",options:{offset:this._getOffset()}},{name:"preventOverflow",options:{boundary:this._config.boundary}},{name:"arrow",options:{element:`.${this.constructor.NAME}-arrow`}},{name:"onChange",enabled:!0,phase:"afterWrite",fn:ri=>this._handlePopperPlacementChange(ri)}],onFirstUpdate:ri=>{ri.options.placement!==ri.placement&&this._handlePopperPlacementChange(ri)}};return Vi(Vi({},ei),typeof this._config.popperConfig=="function"?this._config.popperConfig(ei):this._config.popperConfig)}_addAttachmentClass(ti){this.getTipElement().classList.add(`${_p}-${this.updateAttachment(ti)}`)}_getAttachment(ti){return OT[ti.toUpperCase()]}_setListeners(){this._config.trigger.split(" ").forEach(ei=>{if(ei==="click")Ti.on(this._element,this.constructor.Event.CLICK,this._config.selector,ri=>this.toggle(ri));else if(ei!==MT){let ri=ei===ba?this.constructor.Event.MOUSEENTER:this.constructor.Event.FOCUSIN,ni=ei===ba?this.constructor.Event.MOUSELEAVE:this.constructor.Event.FOCUSOUT;Ti.on(this._element,ri,this._config.selector,si=>this._enter(si)),Ti.on(this._element,ni,this._config.selector,si=>this._leave(si))}}),this._hideModalHandler=()=>{this._element&&this.hide()},Ti.on(this._element.closest(`.${wp}`),"hide.bs.modal",this._hideModalHandler),this._config.selector?this._config=rl(Vi({},this._config),{trigger:"manual",selector:""}):this._fixTitle()}_fixTitle(){let ti=this._element.getAttribute("title"),ei=typeof this._element.getAttribute("data-bs-original-title");(ti||ei!=="string")&&(this._element.setAttribute("data-bs-original-title",ti||""),ti&&!this._element.getAttribute("aria-label")&&!this._element.textContent&&this._element.setAttribute("aria-label",ti),this._element.setAttribute("title",""))}_enter(ti,ei){if(ei=this._initializeOnDelegatedTarget(ti,ei),ti&&(ei._activeTrigger[ti.type==="focusin"?ku:ba]=!0),ei.getTipElement().classList.contains(ga)||ei._hoverState===va){ei._hoverState=va;return}if(clearTimeout(ei._timeout),ei._hoverState=va,!ei._config.delay||!ei._config.delay.show){ei.show();return}ei._timeout=setTimeout(()=>{ei._hoverState===va&&ei.show()},ei._config.delay.show)}_leave(ti,ei){if(ei=this._initializeOnDelegatedTarget(ti,ei),ti&&(ei._activeTrigger[ti.type==="focusout"?ku:ba]=ei._element.contains(ti.relatedTarget)),!ei._isWithActiveTrigger()){if(clearTimeout(ei._timeout),ei._hoverState=Nu,!ei._config.delay||!ei._config.delay.hide){ei.hide();return}ei._timeout=setTimeout(()=>{ei._hoverState===Nu&&ei.hide()},ei._config.delay.hide)}}_isWithActiveTrigger(){for(let ti in this._activeTrigger)if(this._activeTrigger[ti])return!0;return!1}_getConfig(ti){let ei=$r.getDataAttributes(this._element);return Object.keys(ei).forEach(ri=>{ST.has(ri)&&delete ei[ri]}),ti=Vi(Vi(Vi({},this.constructor.Default),ei),typeof ti=="object"&&ti?ti:{}),ti.container=ti.container===!1?document.body:To(ti.container),typeof ti.delay=="number"&&(ti.delay={show:ti.delay,hide:ti.delay}),typeof ti.title=="number"&&(ti.title=ti.title.toString()),typeof ti.content=="number"&&(ti.content=ti.content.toString()),Xn(Ep,ti,this.constructor.DefaultType),ti.sanitize&&(ti.template=yp(ti.template,ti.allowList,ti.sanitizeFn)),ti}_getDelegateConfig(){let ti={};if(this._config)for(let ei in this._config)this.constructor.Default[ei]!==this._config[ei]&&(ti[ei]=this._config[ei]);return ti}_cleanTipClass(){let ti=this.getTipElement(),ei=ti.getAttribute("class").match(xT);ei!==null&&ei.length>0&&ei.map(ri=>ri.trim()).forEach(ri=>ti.classList.remove(ri))}_handlePopperPlacementChange(ti){let{state:ei}=ti;!ei||(this.tip=ei.elements.popper,this._cleanTipClass(),this._addAttachmentClass(this._getAttachment(ei.placement)))}static jQueryInterface(ti){return this.each(function(){let ei=qn.getOrCreateInstance(this,ti);if(typeof ti=="string"){if(typeof ei[ti]=="undefined")throw new TypeError(`No method named "${ti}"`);ei[ti]()}})}};En(qn);var RT="popover",NT="bs.popover",$n=`.${NT}`,xp="bs-popover",kT=new RegExp(`(^|\\s)${xp}\\S+`,"g"),IT=rl(Vi({},qn.Default),{placement:"right",offset:[0,8],trigger:"click",content:"",template:'
'}),PT=rl(Vi({},qn.DefaultType),{content:"(string|element|function)"}),jT={HIDE:`hide${$n}`,HIDDEN:`hidden${$n}`,SHOW:`show${$n}`,SHOWN:`shown${$n}`,INSERTED:`inserted${$n}`,CLICK:`click${$n}`,FOCUSIN:`focusin${$n}`,FOCUSOUT:`focusout${$n}`,MOUSEENTER:`mouseenter${$n}`,MOUSELEAVE:`mouseleave${$n}`},HT="fade",qT="show",Sp=".popover-header",Tp=".popover-body",Vs=class extends qn{static get Default(){return IT}static get NAME(){return RT}static get Event(){return jT}static get DefaultType(){return PT}isWithContent(){return this.getTitle()||this._getContent()}getTipElement(){return this.tip?this.tip:(this.tip=super.getTipElement(),this.getTitle()||Ui.findOne(Sp,this.tip).remove(),this._getContent()||Ui.findOne(Tp,this.tip).remove(),this.tip)}setContent(){let ti=this.getTipElement();this.setElementContent(Ui.findOne(Sp,ti),this.getTitle());let ei=this._getContent();typeof ei=="function"&&(ei=ei.call(this._element)),this.setElementContent(Ui.findOne(Tp,ti),ei),ti.classList.remove(HT,qT)}_addAttachmentClass(ti){this.getTipElement().classList.add(`${xp}-${this.updateAttachment(ti)}`)}_getContent(){return this._element.getAttribute("data-bs-content")||this._config.content}_cleanTipClass(){let ti=this.getTipElement(),ei=ti.getAttribute("class").match(kT);ei!==null&&ei.length>0&&ei.map(ri=>ri.trim()).forEach(ri=>ti.classList.remove(ri))}static jQueryInterface(ti){return this.each(function(){let ei=Vs.getOrCreateInstance(this,ti);if(typeof ti=="string"){if(typeof ei[ti]=="undefined")throw new TypeError(`No method named "${ti}"`);ei[ti]()}})}};En(Vs);var Iu="scrollspy",$T="bs.scrollspy",Ol=`.${$T}`,BT=".data-api",Op={offset:10,method:"auto",target:""},zT={offset:"number",method:"string",target:"(string|element)"},FT=`activate${Ol}`,UT=`scroll${Ol}`,WT=`load${Ol}${BT}`,Dp="dropdown-item",Gs="active",VT='[data-bs-spy="scroll"]',GT=".nav, .list-group",Pu=".nav-link",YT=".nav-item",Cp=".list-group-item",KT=".dropdown",XT=".dropdown-toggle",JT="offset",Ap="position",ya=class extends _n{constructor(ti,ei){super(ti);this._scrollElement=this._element.tagName==="BODY"?window:this._element,this._config=this._getConfig(ei),this._selector=`${this._config.target} ${Pu}, ${this._config.target} ${Cp}, ${this._config.target} .${Dp}`,this._offsets=[],this._targets=[],this._activeTarget=null,this._scrollHeight=0,Ti.on(this._scrollElement,UT,()=>this._process()),this.refresh(),this._process()}static get Default(){return Op}static get NAME(){return Iu}refresh(){let ti=this._scrollElement===this._scrollElement.window?JT:Ap,ei=this._config.method==="auto"?ti:this._config.method,ri=ei===Ap?this._getScrollTop():0;this._offsets=[],this._targets=[],this._scrollHeight=this._getScrollHeight(),Ui.find(this._selector).map(si=>{let oi=yu(si),ai=oi?Ui.findOne(oi):null;if(ai){let li=ai.getBoundingClientRect();if(li.width||li.height)return[$r[ei](ai).top+ri,oi]}return null}).filter(si=>si).sort((si,oi)=>si[0]-oi[0]).forEach(si=>{this._offsets.push(si[0]),this._targets.push(si[1])})}dispose(){Ti.off(this._scrollElement,Ol),super.dispose()}_getConfig(ti){if(ti=Vi(Vi(Vi({},Op),$r.getDataAttributes(this._element)),typeof ti=="object"&&ti?ti:{}),typeof ti.target!="string"&&ds(ti.target)){let{id:ei}=ti.target;ei||(ei=wh(Iu),ti.target.id=ei),ti.target=`#${ei}`}return Xn(Iu,ti,zT),ti}_getScrollTop(){return this._scrollElement===window?this._scrollElement.pageYOffset:this._scrollElement.scrollTop}_getScrollHeight(){return this._scrollElement.scrollHeight||Math.max(document.body.scrollHeight,document.documentElement.scrollHeight)}_getOffsetHeight(){return this._scrollElement===window?window.innerHeight:this._scrollElement.getBoundingClientRect().height}_process(){let ti=this._getScrollTop()+this._config.offset,ei=this._getScrollHeight(),ri=this._config.offset+ei-this._getOffsetHeight();if(this._scrollHeight!==ei&&this.refresh(),ti>=ri){let ni=this._targets[this._targets.length-1];this._activeTarget!==ni&&this._activate(ni);return}if(this._activeTarget&&ti
"+yr+"
",1);default:return l(yr,0)}}}function Z(yr){yr&&yr()}function p(yr,br){return Object.prototype.toString.call(yr)==="[object "+br+"]"}function m(yr){return p(yr,"Function")}function x(yr){return p(yr,"Object")}function W(yr){var br="htmx-internal-data",mr=yr[br];return mr||(mr=yr[br]={}),mr}function y(yr){var br=[];if(yr)for(var mr=0;mr${Sr}
',trigger:"hover focus",title:"",delay:0,html:!1,selector:!1,placement:"top",offset:[0,0],container:!1,fallbackPlacements:["top","right","bottom","left"],boundary:"clippingParents",customClass:"",sanitize:!0,sanitizeFn:null,allowList:FT,popperConfig:null},YT={HIDE:`hide${jn}`,HIDDEN:`hidden${jn}`,SHOW:`show${jn}`,SHOWN:`shown${jn}`,INSERTED:`inserted${jn}`,CLICK:`click${jn}`,FOCUSIN:`focusin${jn}`,FOCUSOUT:`focusout${jn}`,MOUSEENTER:`mouseenter${jn}`,MOUSELEAVE:`mouseleave${jn}`},Cl="fade",qp="modal",ya="show",Ea="show",Hu="out",KT=".tooltip-inner",wa="hover",Bu="focus",XT="click",JT="manual",Hn=class extends _n{constructor(br,mr){if(typeof bl=="undefined")throw new TypeError("Bootstrap's tooltips require Popper (https://popper.js.org)");super(br);this._isEnabled=!0,this._timeout=0,this._hoverState="",this._activeTrigger={},this._popper=null,this._config=this._getConfig(mr),this.tip=null,this._setListeners()}static get Default(){return GT}static get NAME(){return Rp}static get Event(){return YT}static get DefaultType(){return VT}enable(){this._isEnabled=!0}disable(){this._isEnabled=!1}toggleEnabled(){this._isEnabled=!this._isEnabled}toggle(br){if(!!this._isEnabled)if(br){let mr=this._initializeOnDelegatedTarget(br);mr._activeTrigger.click=!mr._activeTrigger.click,mr._isWithActiveTrigger()?mr._enter(null,mr):mr._leave(null,mr)}else{if(this.getTipElement().classList.contains(ya)){this._leave(null,this);return}this._enter(null,this)}}dispose(){clearTimeout(this._timeout),$r.off(this._element.closest(`.${qp}`),"hide.bs.modal",this._hideModalHandler),this.tip&&this.tip.remove(),this._popper&&this._popper.destroy(),super.dispose()}show(){if(this._element.style.display==="none")throw new Error("Please use show on visible elements");if(!(this.isWithContent()&&this._isEnabled))return;let br=$r.trigger(this._element,this.constructor.Event.SHOW),mr=jh(this._element),Er=mr===null?this._element.ownerDocument.documentElement.contains(this._element):mr.contains(this._element);if(br.defaultPrevented||!Er)return;let wr=this.getTipElement(),_r=qh(this.constructor.NAME);wr.setAttribute("id",_r),this._element.setAttribute("aria-describedby",_r),this.setContent(),this._config.animation&&wr.classList.add(Cl);let xr=typeof this._config.placement=="function"?this._config.placement.call(this,wr,this._element):this._config.placement,Sr=this._getAttachment(xr);this._addAttachmentClass(Sr);let{container:Tr}=this._config;Hs.set(wr,this.constructor.DATA_KEY,this),this._element.ownerDocument.documentElement.contains(this.tip)||(Tr.appendChild(wr),$r.trigger(this._element,this.constructor.Event.INSERTED)),this._popper?this._popper.update():this._popper=vl(this._element,wr,this._getPopperConfig(Sr)),wr.classList.add(ya);let Dr=typeof this._config.customClass=="function"?this._config.customClass():this._config.customClass;Dr&&wr.classList.add(...Dr.split(" ")),"ontouchstart"in document.documentElement&&[].concat(...document.body.children).forEach(Ar=>{$r.on(Ar,"mouseover",El)});let Or=()=>{let Ar=this._hoverState;this._hoverState=null,$r.trigger(this._element,this.constructor.Event.SHOWN),Ar===Hu&&this._leave(null,this)},Cr=this.tip.classList.contains(Cl);this._queueCallback(Or,this.tip,Cr)}hide(){if(!this._popper)return;let br=this.getTipElement(),mr=()=>{this._isWithActiveTrigger()||(this._hoverState!==Ea&&br.remove(),this._cleanTipClass(),this._element.removeAttribute("aria-describedby"),$r.trigger(this._element,this.constructor.Event.HIDDEN),this._popper&&(this._popper.destroy(),this._popper=null))};if($r.trigger(this._element,this.constructor.Event.HIDE).defaultPrevented)return;br.classList.remove(ya),"ontouchstart"in document.documentElement&&[].concat(...document.body.children).forEach(_r=>$r.off(_r,"mouseover",El)),this._activeTrigger[XT]=!1,this._activeTrigger[Bu]=!1,this._activeTrigger[wa]=!1;let wr=this.tip.classList.contains(Cl);this._queueCallback(mr,this.tip,wr),this._hoverState=""}update(){this._popper!==null&&this._popper.update()}isWithContent(){return Boolean(this.getTitle())}getTipElement(){if(this.tip)return this.tip;let br=document.createElement("div");return br.innerHTML=this._config.template,this.tip=br.children[0],this.tip}setContent(){let br=this.getTipElement();this.setElementContent(ai.findOne(KT,br),this.getTitle()),br.classList.remove(Cl,ya)}setElementContent(br,mr){if(br!==null){if(ds(mr)){mr=Do(mr),this._config.html?mr.parentNode!==br&&(br.innerHTML="",br.appendChild(mr)):br.textContent=mr.textContent;return}this._config.html?(this._config.sanitize&&(mr=kp(mr,this._config.allowList,this._config.sanitizeFn)),br.innerHTML=mr):br.textContent=mr}}getTitle(){let br=this._element.getAttribute("data-bs-original-title");return br||(br=typeof this._config.title=="function"?this._config.title.call(this._element):this._config.title),br}updateAttachment(br){return br==="right"?"end":br==="left"?"start":br}_initializeOnDelegatedTarget(br,mr){let Er=this.constructor.DATA_KEY;return mr=mr||Hs.get(br.delegateTarget,Er),mr||(mr=new this.constructor(br.delegateTarget,this._getDelegateConfig()),Hs.set(br.delegateTarget,Er,mr)),mr}_getOffset(){let{offset:br}=this._config;return typeof br=="string"?br.split(",").map(mr=>Number.parseInt(mr,10)):typeof br=="function"?mr=>br(mr,this._element):br}_getPopperConfig(br){let mr={placement:br,modifiers:[{name:"flip",options:{fallbackPlacements:this._config.fallbackPlacements}},{name:"offset",options:{offset:this._getOffset()}},{name:"preventOverflow",options:{boundary:this._config.boundary}},{name:"arrow",options:{element:`.${this.constructor.NAME}-arrow`}},{name:"onChange",enabled:!0,phase:"afterWrite",fn:Er=>this._handlePopperPlacementChange(Er)}],onFirstUpdate:Er=>{Er.options.placement!==Er.placement&&this._handlePopperPlacementChange(Er)}};return ci(ci({},mr),typeof this._config.popperConfig=="function"?this._config.popperConfig(mr):this._config.popperConfig)}_addAttachmentClass(br){this.getTipElement().classList.add(`${Np}-${this.updateAttachment(br)}`)}_getAttachment(br){return WT[br.toUpperCase()]}_setListeners(){this._config.trigger.split(" ").forEach(mr=>{if(mr==="click")$r.on(this._element,this.constructor.Event.CLICK,this._config.selector,Er=>this.toggle(Er));else if(mr!==JT){let Er=mr===wa?this.constructor.Event.MOUSEENTER:this.constructor.Event.FOCUSIN,wr=mr===wa?this.constructor.Event.MOUSELEAVE:this.constructor.Event.FOCUSOUT;$r.on(this._element,Er,this._config.selector,_r=>this._enter(_r)),$r.on(this._element,wr,this._config.selector,_r=>this._leave(_r))}}),this._hideModalHandler=()=>{this._element&&this.hide()},$r.on(this._element.closest(`.${qp}`),"hide.bs.modal",this._hideModalHandler),this._config.selector?this._config=al(ci({},this._config),{trigger:"manual",selector:""}):this._fixTitle()}_fixTitle(){let br=this._element.getAttribute("title"),mr=typeof this._element.getAttribute("data-bs-original-title");(br||mr!=="string")&&(this._element.setAttribute("data-bs-original-title",br||""),br&&!this._element.getAttribute("aria-label")&&!this._element.textContent&&this._element.setAttribute("aria-label",br),this._element.setAttribute("title",""))}_enter(br,mr){if(mr=this._initializeOnDelegatedTarget(br,mr),br&&(mr._activeTrigger[br.type==="focusin"?Bu:wa]=!0),mr.getTipElement().classList.contains(ya)||mr._hoverState===Ea){mr._hoverState=Ea;return}if(clearTimeout(mr._timeout),mr._hoverState=Ea,!mr._config.delay||!mr._config.delay.show){mr.show();return}mr._timeout=setTimeout(()=>{mr._hoverState===Ea&&mr.show()},mr._config.delay.show)}_leave(br,mr){if(mr=this._initializeOnDelegatedTarget(br,mr),br&&(mr._activeTrigger[br.type==="focusout"?Bu:wa]=mr._element.contains(br.relatedTarget)),!mr._isWithActiveTrigger()){if(clearTimeout(mr._timeout),mr._hoverState=Hu,!mr._config.delay||!mr._config.delay.hide){mr.hide();return}mr._timeout=setTimeout(()=>{mr._hoverState===Hu&&mr.hide()},mr._config.delay.hide)}}_isWithActiveTrigger(){for(let br in this._activeTrigger)if(this._activeTrigger[br])return!0;return!1}_getConfig(br){let mr=Bi.getDataAttributes(this._element);return Object.keys(mr).forEach(Er=>{UT.has(Er)&&delete mr[Er]}),br=ci(ci(ci({},this.constructor.Default),mr),typeof br=="object"&&br?br:{}),br.container=br.container===!1?document.body:Do(br.container),typeof br.delay=="number"&&(br.delay={show:br.delay,hide:br.delay}),typeof br.title=="number"&&(br.title=br.title.toString()),typeof br.content=="number"&&(br.content=br.content.toString()),Xn(Rp,br,this.constructor.DefaultType),br.sanitize&&(br.template=kp(br.template,br.allowList,br.sanitizeFn)),br}_getDelegateConfig(){let br={};if(this._config)for(let mr in this._config)this.constructor.Default[mr]!==this._config[mr]&&(br[mr]=this._config[mr]);return br}_cleanTipClass(){let br=this.getTipElement(),mr=br.getAttribute("class").match($T);mr!==null&&mr.length>0&&mr.map(Er=>Er.trim()).forEach(Er=>br.classList.remove(Er))}_handlePopperPlacementChange(br){let{state:mr}=br;!mr||(this.tip=mr.elements.popper,this._cleanTipClass(),this._addAttachmentClass(this._getAttachment(mr.placement)))}static jQueryInterface(br){return this.each(function(){let mr=Hn.getOrCreateInstance(this,br);if(typeof br=="string"){if(typeof mr[br]=="undefined")throw new TypeError(`No method named "${br}"`);mr[br]()}})}};wn(Hn);var QT="popover",ZT="bs.popover",Bn=`.${ZT}`,Ip="bs-popover",eD=new RegExp(`(^|\\s)${Ip}\\S+`,"g"),tD=al(ci({},Hn.Default),{placement:"right",offset:[0,8],trigger:"click",content:"",template:'
'}),rD=al(ci({},Hn.DefaultType),{content:"(string|element|function)"}),iD={HIDE:`hide${Bn}`,HIDDEN:`hidden${Bn}`,SHOW:`show${Bn}`,SHOWN:`shown${Bn}`,INSERTED:`inserted${Bn}`,CLICK:`click${Bn}`,FOCUSIN:`focusin${Bn}`,FOCUSOUT:`focusout${Bn}`,MOUSEENTER:`mouseenter${Bn}`,MOUSELEAVE:`mouseleave${Bn}`},nD="fade",sD="show",Pp=".popover-header",jp=".popover-body",Ws=class extends Hn{static get Default(){return tD}static get NAME(){return QT}static get Event(){return iD}static get DefaultType(){return rD}isWithContent(){return this.getTitle()||this._getContent()}getTipElement(){return this.tip?this.tip:(this.tip=super.getTipElement(),this.getTitle()||ai.findOne(Pp,this.tip).remove(),this._getContent()||ai.findOne(jp,this.tip).remove(),this.tip)}setContent(){let br=this.getTipElement();this.setElementContent(ai.findOne(Pp,br),this.getTitle());let mr=this._getContent();typeof mr=="function"&&(mr=mr.call(this._element)),this.setElementContent(ai.findOne(jp,br),mr),br.classList.remove(nD,sD)}_addAttachmentClass(br){this.getTipElement().classList.add(`${Ip}-${this.updateAttachment(br)}`)}_getContent(){return this._element.getAttribute("data-bs-content")||this._config.content}_cleanTipClass(){let br=this.getTipElement(),mr=br.getAttribute("class").match(eD);mr!==null&&mr.length>0&&mr.map(Er=>Er.trim()).forEach(Er=>br.classList.remove(Er))}static jQueryInterface(br){return this.each(function(){let mr=Ws.getOrCreateInstance(this,br);if(typeof br=="string"){if(typeof mr[br]=="undefined")throw new TypeError(`No method named "${br}"`);mr[br]()}})}};wn(Ws);var Fu="scrollspy",oD="bs.scrollspy",Ll=`.${oD}`,aD=".data-api",Hp={offset:10,method:"auto",target:""},lD={offset:"number",method:"string",target:"(string|element)"},cD=`activate${Ll}`,uD=`scroll${Ll}`,dD=`load${Ll}${aD}`,Bp="dropdown-item",Gs="active",fD='[data-bs-spy="scroll"]',hD=".nav, .list-group",zu=".nav-link",pD=".nav-item",Fp=".list-group-item",mD=".dropdown",gD=".dropdown-toggle",vD="offset",zp="position",_a=class extends _n{constructor(br,mr){super(br);this._scrollElement=this._element.tagName==="BODY"?window:this._element,this._config=this._getConfig(mr),this._selector=`${this._config.target} ${zu}, ${this._config.target} ${Fp}, ${this._config.target} .${Bp}`,this._offsets=[],this._targets=[],this._activeTarget=null,this._scrollHeight=0,$r.on(this._scrollElement,uD,()=>this._process()),this.refresh(),this._process()}static get Default(){return Hp}static get NAME(){return Fu}refresh(){let br=this._scrollElement===this._scrollElement.window?vD:zp,mr=this._config.method==="auto"?br:this._config.method,Er=mr===zp?this._getScrollTop():0;this._offsets=[],this._targets=[],this._scrollHeight=this._getScrollHeight(),ai.find(this._selector).map(_r=>{let xr=Tu(_r),Sr=xr?ai.findOne(xr):null;if(Sr){let Tr=Sr.getBoundingClientRect();if(Tr.width||Tr.height)return[Bi[mr](Sr).top+Er,xr]}return null}).filter(_r=>_r).sort((_r,xr)=>_r[0]-xr[0]).forEach(_r=>{this._offsets.push(_r[0]),this._targets.push(_r[1])})}dispose(){$r.off(this._scrollElement,Ll),super.dispose()}_getConfig(br){if(br=ci(ci(ci({},Hp),Bi.getDataAttributes(this._element)),typeof br=="object"&&br?br:{}),typeof br.target!="string"&&ds(br.target)){let{id:mr}=br.target;mr||(mr=qh(Fu),br.target.id=mr),br.target=`#${mr}`}return Xn(Fu,br,lD),br}_getScrollTop(){return this._scrollElement===window?this._scrollElement.pageYOffset:this._scrollElement.scrollTop}_getScrollHeight(){return this._scrollElement.scrollHeight||Math.max(document.body.scrollHeight,document.documentElement.scrollHeight)}_getOffsetHeight(){return this._scrollElement===window?window.innerHeight:this._scrollElement.getBoundingClientRect().height}_process(){let br=this._getScrollTop()+this._config.offset,mr=this._getScrollHeight(),Er=this._config.offset+mr-this._getOffsetHeight();if(this._scrollHeight!==mr&&this.refresh(),br>=Er){let wr=this._targets[this._targets.length-1];this._activeTarget!==wr&&this._activate(wr);return}if(this._activeTarget&&br