|
|
@@ -2421,8 +2421,8 @@ class DeviceBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditF
|
|
|
class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilterForm, CustomFieldFilterForm):
|
|
|
model = Device
|
|
|
field_order = [
|
|
|
- 'q', 'region_id', 'site_id', 'location_id', 'rack_id', 'status', 'role_id', 'tenant_group_id', 'tenant_id',
|
|
|
- 'manufacturer_id', 'device_type_id', 'asset_tag', 'mac_address', 'has_primary_ip',
|
|
|
+ 'q', 'region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', 'status', 'role_id', 'tenant_group_id',
|
|
|
+ 'tenant_id', 'manufacturer_id', 'device_type_id', 'asset_tag', 'mac_address', 'has_primary_ip',
|
|
|
]
|
|
|
q = forms.CharField(
|
|
|
required=False,
|
|
|
@@ -2433,11 +2433,17 @@ class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilt
|
|
|
required=False,
|
|
|
label=_('Region')
|
|
|
)
|
|
|
+ site_group_id = DynamicModelMultipleChoiceField(
|
|
|
+ queryset=SiteGroup.objects.all(),
|
|
|
+ required=False,
|
|
|
+ label=_('Site group')
|
|
|
+ )
|
|
|
site_id = DynamicModelMultipleChoiceField(
|
|
|
queryset=Site.objects.all(),
|
|
|
required=False,
|
|
|
query_params={
|
|
|
- 'region_id': '$region_id'
|
|
|
+ 'region_id': '$region_id',
|
|
|
+ 'group_id': '$site_group_id',
|
|
|
},
|
|
|
label=_('Site')
|
|
|
)
|