Fixes #6188: Support custom field filtering for regions, site groups, and locations

This commit is contained in:
jeremystretch 2021-04-19 10:57:13 -04:00
parent 97c087ef5f
commit a2d16143e3
2 changed files with 6 additions and 4 deletions

View File

@ -5,6 +5,7 @@
### Bug Fixes
* [#6184](https://github.com/netbox-community/netbox/issues/6184) - Fix parent object table column in prefix IP addresses list
* [#6188](https://github.com/netbox-community/netbox/issues/6188) - Support custom field filtering for regions, site groups, and locations
* [#6196](https://github.com/netbox-community/netbox/issues/6196) - Fix object list display for users with read-only permissions
---

View File

@ -230,7 +230,7 @@ class RegionBulkEditForm(BootstrapMixin, CustomFieldBulkEditForm):
nullable_fields = ['parent', 'description']
class RegionFilterForm(BootstrapMixin, forms.Form):
class RegionFilterForm(BootstrapMixin, CustomFieldFilterForm):
model = Site
q = forms.CharField(
required=False,
@ -287,8 +287,8 @@ class SiteGroupBulkEditForm(BootstrapMixin, CustomFieldBulkEditForm):
nullable_fields = ['parent', 'description']
class SiteGroupFilterForm(BootstrapMixin, forms.Form):
model = Site
class SiteGroupFilterForm(BootstrapMixin, CustomFieldFilterForm):
model = SiteGroup
q = forms.CharField(
required=False,
label=_('Search')
@ -557,7 +557,8 @@ class LocationBulkEditForm(BootstrapMixin, CustomFieldBulkEditForm):
nullable_fields = ['parent', 'description']
class LocationFilterForm(BootstrapMixin, forms.Form):
class LocationFilterForm(BootstrapMixin, CustomFieldFilterForm):
model = Location
region_id = DynamicModelMultipleChoiceField(
queryset=Region.objects.all(),
required=False,