diff --git a/netbox/ipam/forms/filtersets.py b/netbox/ipam/forms/filtersets.py index 10dbb0bcd..57c0f479c 100644 --- a/netbox/ipam/forms/filtersets.py +++ b/netbox/ipam/forms/filtersets.py @@ -170,7 +170,7 @@ class PrefixFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm): ), FieldSet('vlan_id', name=_('VLAN Assignment')), FieldSet('vrf_id', 'present_in_vrf_id', name=_('VRF')), - # FieldSet('region_id', 'site_group_id', 'site_id', name=_('Location')), + FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', name=_('Scope')), FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')), ) mask_length__lte = forms.IntegerField( @@ -211,25 +211,26 @@ class PrefixFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm): choices=PrefixStatusChoices, required=False ) - # region_id = DynamicModelMultipleChoiceField( - # queryset=Region.objects.all(), - # 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, - # null_option='None', - # query_params={ - # 'region_id': '$region_id' - # }, - # label=_('Site') - # ) + region_id = DynamicModelMultipleChoiceField( + queryset=Region.objects.all(), + 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, + label=_('Site') + ) + location_id = DynamicModelMultipleChoiceField( + queryset=Location.objects.all(), + required=False, + label=_('Location') + ) role_id = DynamicModelMultipleChoiceField( queryset=Role.objects.all(), required=False,