Merge v3.1.3

2024-05-10 07:54:54 +00:00 · 2021-12-29 12:41:56 -05:00
parent e0126d971c c3f2fee633
commit 3bb485d0b8
37 changed files with 362 additions and 538 deletions
--- a/netbox/dcim/forms/filtersets.py
+++ b/netbox/dcim/forms/filtersets.py
@@ -62,14 +62,12 @@ class DeviceComponentFilterForm(CustomFieldModelFilterForm):
    region_id = DynamicModelMultipleChoiceField(
        queryset=Region.objects.all(),
        required=False,
-        label=_('Region'),
-        fetch_trigger='open'
+        label=_('Region')
    )
    site_group_id = DynamicModelMultipleChoiceField(
        queryset=SiteGroup.objects.all(),
        required=False,
-        label=_('Site group'),
-        fetch_trigger='open'
+        label=_('Site group')
    )
    site_id = DynamicModelMultipleChoiceField(
        queryset=Site.objects.all(),
@@ -78,8 +76,7 @@ class DeviceComponentFilterForm(CustomFieldModelFilterForm):
            'region_id': '$region_id',
            'group_id': '$site_group_id',
        },
-        label=_('Site'),
-        fetch_trigger='open'
+        label=_('Site')
    )
    location_id = DynamicModelMultipleChoiceField(
        queryset=Location.objects.all(),
@@ -87,14 +84,12 @@ class DeviceComponentFilterForm(CustomFieldModelFilterForm):
        query_params={
            'site_id': '$site_id',
        },
-        label=_('Location'),
-        fetch_trigger='open'
+        label=_('Location')
    )
    virtual_chassis_id = DynamicModelMultipleChoiceField(
        queryset=VirtualChassis.objects.all(),
        required=False,
-        label=_('Virtual Chassis'),
-        fetch_trigger='open'
+        label=_('Virtual Chassis')
    )
    device_id = DynamicModelMultipleChoiceField(
        queryset=Device.objects.all(),
@@ -104,8 +99,7 @@ class DeviceComponentFilterForm(CustomFieldModelFilterForm):
            'location_id': '$location_id',
            'virtual_chassis_id': '$virtual_chassis_id'
        },
-        label=_('Device'),
-        fetch_trigger='open'
+        label=_('Device')
    )


@@ -114,8 +108,7 @@ class RegionFilterForm(CustomFieldModelFilterForm):
    parent_id = DynamicModelMultipleChoiceField(
        queryset=Region.objects.all(),
        required=False,
-        label=_('Parent region'),
-        fetch_trigger='open'
+        label=_('Parent region')
    )
    tag = TagFilterField(model)

@@ -125,8 +118,7 @@ class SiteGroupFilterForm(CustomFieldModelFilterForm):
    parent_id = DynamicModelMultipleChoiceField(
        queryset=SiteGroup.objects.all(),
        required=False,
-        label=_('Parent group'),
-        fetch_trigger='open'
+        label=_('Parent group')
    )
    tag = TagFilterField(model)

@@ -147,20 +139,17 @@ class SiteFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
    region_id = DynamicModelMultipleChoiceField(
        queryset=Region.objects.all(),
        required=False,
-        label=_('Region'),
-        fetch_trigger='open'
+        label=_('Region')
    )
    group_id = DynamicModelMultipleChoiceField(
        queryset=SiteGroup.objects.all(),
        required=False,
-        label=_('Site group'),
-        fetch_trigger='open'
+        label=_('Site group')
    )
    asn_id = DynamicModelMultipleChoiceField(
        queryset=ASN.objects.all(),
        required=False,
-        label=_('ASNs'),
-        fetch_trigger='open'
+        label=_('ASNs')
    )
    tag = TagFilterField(model)

@@ -175,14 +164,12 @@ class LocationFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
    region_id = DynamicModelMultipleChoiceField(
        queryset=Region.objects.all(),
        required=False,
-        label=_('Region'),
-        fetch_trigger='open'
+        label=_('Region')
    )
    site_group_id = DynamicModelMultipleChoiceField(
        queryset=SiteGroup.objects.all(),
        required=False,
-        label=_('Site group'),
-        fetch_trigger='open'
+        label=_('Site group')
    )
    site_id = DynamicModelMultipleChoiceField(
        queryset=Site.objects.all(),
@@ -191,8 +178,7 @@ class LocationFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
            'region_id': '$region_id',
            'group_id': '$site_group_id',
        },
-        label=_('Site'),
-        fetch_trigger='open'
+        label=_('Site')
    )
    parent_id = DynamicModelMultipleChoiceField(
        queryset=Location.objects.all(),
@@ -201,8 +187,7 @@ class LocationFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
            'region_id': '$region_id',
            'site_id': '$site_id',
        },
-        label=_('Parent'),
-        fetch_trigger='open'
+        label=_('Parent')
    )
    tag = TagFilterField(model)

@@ -224,8 +209,7 @@ class RackFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
    region_id = DynamicModelMultipleChoiceField(
        queryset=Region.objects.all(),
        required=False,
-        label=_('Region'),
-        fetch_trigger='open'
+        label=_('Region')
    )
    site_id = DynamicModelMultipleChoiceField(
        queryset=Site.objects.all(),
@@ -233,8 +217,7 @@ class RackFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
        query_params={
            'region_id': '$region_id'
        },
-        label=_('Site'),
-        fetch_trigger='open'
+        label=_('Site')
    )
    location_id = DynamicModelMultipleChoiceField(
        queryset=Location.objects.all(),
@@ -243,8 +226,7 @@ class RackFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
        query_params={
            'site_id': '$site_id'
        },
-        label=_('Location'),
-        fetch_trigger='open'
+        label=_('Location')
    )
    status = forms.MultipleChoiceField(
        choices=RackStatusChoices,
@@ -265,8 +247,7 @@ class RackFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
        queryset=RackRole.objects.all(),
        required=False,
        null_option='None',
-        label=_('Role'),
-        fetch_trigger='open'
+        label=_('Role')
    )
    serial = forms.CharField(
        required=False
@@ -285,8 +266,7 @@ class RackElevationFilterForm(RackFilterForm):
        query_params={
            'site_id': '$site_id',
            'location_id': '$location_id',
-        },
-        fetch_trigger='open'
+        }
    )


@@ -301,8 +281,7 @@ class RackReservationFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
    region_id = DynamicModelMultipleChoiceField(
        queryset=Region.objects.all(),
        required=False,
-        label=_('Region'),
-        fetch_trigger='open'
+        label=_('Region')
    )
    site_id = DynamicModelMultipleChoiceField(
        queryset=Site.objects.all(),
@@ -310,15 +289,13 @@ class RackReservationFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
        query_params={
            'region_id': '$region_id'
        },
-        label=_('Site'),
-        fetch_trigger='open'
+        label=_('Site')
    )
    location_id = DynamicModelMultipleChoiceField(
        queryset=Location.objects.prefetch_related('site'),
        required=False,
        label=_('Location'),
-        null_option='None',
-        fetch_trigger='open'
+        null_option='None'
    )
    user_id = DynamicModelMultipleChoiceField(
        queryset=User.objects.all(),
@@ -326,8 +303,7 @@ class RackReservationFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
        label=_('User'),
        widget=APISelectMultiple(
            api_url='/api/users/users/',
-        ),
-        fetch_trigger='open'
+        )
    )
    tag = TagFilterField(model)

@@ -347,8 +323,7 @@ class DeviceTypeFilterForm(CustomFieldModelFilterForm):
    manufacturer_id = DynamicModelMultipleChoiceField(
        queryset=Manufacturer.objects.all(),
        required=False,
-        label=_('Manufacturer'),
-        fetch_trigger='open'
+        label=_('Manufacturer')
    )
    part_number = forms.CharField(
        required=False
@@ -479,8 +454,7 @@ class PlatformFilterForm(CustomFieldModelFilterForm):
    manufacturer_id = DynamicModelMultipleChoiceField(
        queryset=Manufacturer.objects.all(),
        required=False,
-        label=_('Manufacturer'),
-        fetch_trigger='open'
+        label=_('Manufacturer')
    )
    tag = TagFilterField(model)

@@ -501,14 +475,12 @@ class DeviceFilterForm(LocalConfigContextFilterForm, TenancyFilterForm, CustomFi
    region_id = DynamicModelMultipleChoiceField(
        queryset=Region.objects.all(),
        required=False,
-        label=_('Region'),
-        fetch_trigger='open'
+        label=_('Region')
    )
    site_group_id = DynamicModelMultipleChoiceField(
        queryset=SiteGroup.objects.all(),
        required=False,
-        label=_('Site group'),
-        fetch_trigger='open'
+        label=_('Site group')
    )
    site_id = DynamicModelMultipleChoiceField(
        queryset=Site.objects.all(),
@@ -517,8 +489,7 @@ class DeviceFilterForm(LocalConfigContextFilterForm, TenancyFilterForm, CustomFi
            'region_id': '$region_id',
            'group_id': '$site_group_id',
        },
-        label=_('Site'),
-        fetch_trigger='open'
+        label=_('Site')
    )
    location_id = DynamicModelMultipleChoiceField(
        queryset=Location.objects.all(),
@@ -527,8 +498,7 @@ class DeviceFilterForm(LocalConfigContextFilterForm, TenancyFilterForm, CustomFi
        query_params={
            'site_id': '$site_id'
        },
-        label=_('Location'),
-        fetch_trigger='open'
+        label=_('Location')
    )
    rack_id = DynamicModelMultipleChoiceField(
        queryset=Rack.objects.all(),
@@ -538,20 +508,17 @@ class DeviceFilterForm(LocalConfigContextFilterForm, TenancyFilterForm, CustomFi
            'site_id': '$site_id',
            'location_id': '$location_id',
        },
-        label=_('Rack'),
-        fetch_trigger='open'
+        label=_('Rack')
    )
    role_id = DynamicModelMultipleChoiceField(
        queryset=DeviceRole.objects.all(),
        required=False,
-        label=_('Role'),
-        fetch_trigger='open'
+        label=_('Role')
    )
    manufacturer_id = DynamicModelMultipleChoiceField(
        queryset=Manufacturer.objects.all(),
        required=False,
-        label=_('Manufacturer'),
-        fetch_trigger='open'
+        label=_('Manufacturer')
    )
    device_type_id = DynamicModelMultipleChoiceField(
        queryset=DeviceType.objects.all(),
@@ -559,15 +526,13 @@ class DeviceFilterForm(LocalConfigContextFilterForm, TenancyFilterForm, CustomFi
        query_params={
            'manufacturer_id': '$manufacturer_id'
        },
-        label=_('Model'),
-        fetch_trigger='open'
+        label=_('Model')
    )
    platform_id = DynamicModelMultipleChoiceField(
        queryset=Platform.objects.all(),
        required=False,
        null_option='None',
-        label=_('Platform'),
-        fetch_trigger='open'
+        label=_('Platform')
    )
    status = forms.MultipleChoiceField(
        choices=DeviceStatusChoices,
@@ -689,14 +654,12 @@ class VirtualChassisFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
    region_id = DynamicModelMultipleChoiceField(
        queryset=Region.objects.all(),
        required=False,
-        label=_('Region'),
-        fetch_trigger='open'
+        label=_('Region')
    )
    site_group_id = DynamicModelMultipleChoiceField(
        queryset=SiteGroup.objects.all(),
        required=False,
-        label=_('Site group'),
-        fetch_trigger='open'
+        label=_('Site group')
    )
    site_id = DynamicModelMultipleChoiceField(
        queryset=Site.objects.all(),
@@ -705,8 +668,7 @@ class VirtualChassisFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
            'region_id': '$region_id',
            'group_id': '$site_group_id',
        },
-        label=_('Site'),
-        fetch_trigger='open'
+        label=_('Site')
    )
    tag = TagFilterField(model)

@@ -722,8 +684,7 @@ class CableFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
    region_id = DynamicModelMultipleChoiceField(
        queryset=Region.objects.all(),
        required=False,
-        label=_('Region'),
-        fetch_trigger='open'
+        label=_('Region')
    )
    site_id = DynamicModelMultipleChoiceField(
        queryset=Site.objects.all(),
@@ -731,8 +692,7 @@ class CableFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
        query_params={
            'region_id': '$region_id'
        },
-        label=_('Site'),
-        fetch_trigger='open'
+        label=_('Site')
    )
    rack_id = DynamicModelMultipleChoiceField(
        queryset=Rack.objects.all(),
@@ -741,8 +701,7 @@ class CableFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
        null_option='None',
        query_params={
            'site_id': '$site_id'
-        },
-        fetch_trigger='open'
+        }
    )
    type = forms.MultipleChoiceField(
        choices=add_blank_choice(CableTypeChoices),
@@ -765,8 +724,7 @@ class CableFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
            'tenant_id': '$tenant_id',
            'rack_id': '$rack_id',
        },
-        label=_('Device'),
-        fetch_trigger='open'
+        label=_('Device')
    )
    tag = TagFilterField(model)

@@ -780,14 +738,12 @@ class PowerPanelFilterForm(CustomFieldModelFilterForm):
    region_id = DynamicModelMultipleChoiceField(
        queryset=Region.objects.all(),
        required=False,
-        label=_('Region'),
-        fetch_trigger='open'
+        label=_('Region')
    )
    site_group_id = DynamicModelMultipleChoiceField(
        queryset=SiteGroup.objects.all(),
        required=False,
-        label=_('Site group'),
-        fetch_trigger='open'
+        label=_('Site group')
    )
    site_id = DynamicModelMultipleChoiceField(
        queryset=Site.objects.all(),
@@ -796,8 +752,7 @@ class PowerPanelFilterForm(CustomFieldModelFilterForm):
            'region_id': '$region_id',
            'group_id': '$site_group_id',
        },
-        label=_('Site'),
-        fetch_trigger='open'
+        label=_('Site')
    )
    location_id = DynamicModelMultipleChoiceField(
        queryset=Location.objects.all(),
@@ -806,8 +761,7 @@ class PowerPanelFilterForm(CustomFieldModelFilterForm):
        query_params={
            'site_id': '$site_id'
        },
-        label=_('Location'),
-        fetch_trigger='open'
+        label=_('Location')
    )
    tag = TagFilterField(model)

@@ -823,14 +777,12 @@ class PowerFeedFilterForm(CustomFieldModelFilterForm):
    region_id = DynamicModelMultipleChoiceField(
        queryset=Region.objects.all(),
        required=False,
-        label=_('Region'),
-        fetch_trigger='open'
+        label=_('Region')
    )
    site_group_id = DynamicModelMultipleChoiceField(
        queryset=SiteGroup.objects.all(),
        required=False,
-        label=_('Site group'),
-        fetch_trigger='open'
+        label=_('Site group')
    )
    site_id = DynamicModelMultipleChoiceField(
        queryset=Site.objects.all(),
@@ -838,8 +790,7 @@ class PowerFeedFilterForm(CustomFieldModelFilterForm):
        query_params={
            'region_id': '$region_id'
        },
-        label=_('Site'),
-        fetch_trigger='open'
+        label=_('Site')
    )
    power_panel_id = DynamicModelMultipleChoiceField(
        queryset=PowerPanel.objects.all(),
@@ -848,8 +799,7 @@ class PowerFeedFilterForm(CustomFieldModelFilterForm):
        query_params={
            'site_id': '$site_id'
        },
-        label=_('Power panel'),
-        fetch_trigger='open'
+        label=_('Power panel')
    )
    rack_id = DynamicModelMultipleChoiceField(
        queryset=Rack.objects.all(),
@@ -858,8 +808,7 @@ class PowerFeedFilterForm(CustomFieldModelFilterForm):
        query_params={
            'site_id': '$site_id'
        },
-        label=_('Rack'),
-        fetch_trigger='open'
+        label=_('Rack')
    )
    status = forms.MultipleChoiceField(
        choices=PowerFeedStatusChoices,
@@ -1109,8 +1058,7 @@ class InventoryItemFilterForm(DeviceComponentFilterForm):
    manufacturer_id = DynamicModelMultipleChoiceField(
        queryset=Manufacturer.objects.all(),
        required=False,
-        label=_('Manufacturer'),
-        fetch_trigger='open'
+        label=_('Manufacturer')
    )
    serial = forms.CharField(
        required=False
@@ -1144,8 +1092,7 @@ class ConsoleConnectionFilterForm(FilterForm):
    region_id = DynamicModelMultipleChoiceField(
        queryset=Region.objects.all(),
        required=False,
-        label=_('Region'),
-        fetch_trigger='open'
+        label=_('Region')
    )
    site_id = DynamicModelMultipleChoiceField(
        queryset=Site.objects.all(),
@@ -1153,8 +1100,7 @@ class ConsoleConnectionFilterForm(FilterForm):
        query_params={
            'region_id': '$region_id'
        },
-        label=_('Site'),
-        fetch_trigger='open'
+        label=_('Site')
    )
    device_id = DynamicModelMultipleChoiceField(
        queryset=Device.objects.all(),
@@ -1162,8 +1108,7 @@ class ConsoleConnectionFilterForm(FilterForm):
        query_params={
            'site_id': '$site_id'
        },
-        label=_('Device'),
-        fetch_trigger='open'
+        label=_('Device')
    )


@@ -1171,8 +1116,7 @@ class PowerConnectionFilterForm(FilterForm):
    region_id = DynamicModelMultipleChoiceField(
        queryset=Region.objects.all(),
        required=False,
-        label=_('Region'),
-        fetch_trigger='open'
+        label=_('Region')
    )
    site_id = DynamicModelMultipleChoiceField(
        queryset=Site.objects.all(),
@@ -1180,8 +1124,7 @@ class PowerConnectionFilterForm(FilterForm):
        query_params={
            'region_id': '$region_id'
        },
-        label=_('Site'),
-        fetch_trigger='open'
+        label=_('Site')
    )
    device_id = DynamicModelMultipleChoiceField(
        queryset=Device.objects.all(),
@@ -1189,8 +1132,7 @@ class PowerConnectionFilterForm(FilterForm):
        query_params={
            'site_id': '$site_id'
        },
-        label=_('Device'),
-        fetch_trigger='open'
+        label=_('Device')
    )


@@ -1198,8 +1140,7 @@ class InterfaceConnectionFilterForm(FilterForm):
    region_id = DynamicModelMultipleChoiceField(
        queryset=Region.objects.all(),
        required=False,
-        label=_('Region'),
-        fetch_trigger='open'
+        label=_('Region')
    )
    site_id = DynamicModelMultipleChoiceField(
        queryset=Site.objects.all(),
@@ -1207,8 +1148,7 @@ class InterfaceConnectionFilterForm(FilterForm):
        query_params={
            'region_id': '$region_id'
        },
-        label=_('Site'),
-        fetch_trigger='open'
+        label=_('Site')
    )
    device_id = DynamicModelMultipleChoiceField(
        queryset=Device.objects.all(),
@@ -1216,6 +1156,5 @@ class InterfaceConnectionFilterForm(FilterForm):
        query_params={
            'site_id': '$site_id'
        },
-        label=_('Device'),
-        fetch_trigger='open'
+        label=_('Device')
    )
--- a/netbox/dcim/forms/models.py
+++ b/netbox/dcim/forms/models.py
@@ -300,16 +300,14 @@ class RackReservationForm(TenancyForm, CustomFieldModelForm):
        required=False,
        initial_params={
            'sites': '$site'
-        },
-        fetch_trigger='open'
+        }
    )
    site_group = DynamicModelChoiceField(
        queryset=SiteGroup.objects.all(),
        required=False,
        initial_params={
            'sites': '$site'
-        },
-        fetch_trigger='open'
+        }
    )
    site = DynamicModelChoiceField(
        queryset=Site.objects.all(),
@@ -317,24 +315,21 @@ class RackReservationForm(TenancyForm, CustomFieldModelForm):
        query_params={
            'region_id': '$region',
            'group_id': '$site_group',
-        },
-        fetch_trigger='open'
+        }
    )
    location = DynamicModelChoiceField(
        queryset=Location.objects.all(),
        required=False,
        query_params={
            'site_id': '$site'
-        },
-        fetch_trigger='open'
+        }
    )
    rack = DynamicModelChoiceField(
        queryset=Rack.objects.all(),
        query_params={
            'site_id': '$site',
            'location_id': '$location',
-        },
-        fetch_trigger='open'
+        }
    )
    units = NumericArrayField(
        base_field=forms.IntegerField(),
@@ -348,8 +343,7 @@ class RackReservationForm(TenancyForm, CustomFieldModelForm):
    )
    tags = DynamicModelMultipleChoiceField(
        queryset=Tag.objects.all(),
-        required=False,
-        fetch_trigger='open'
+        required=False
    )

    class Meta: