From b7ade4af326cea668a50b4a483ff4607362197bc Mon Sep 17 00:00:00 2001 From: Martin Hauser Date: Fri, 24 Oct 2025 15:28:47 +0200 Subject: [PATCH] feat(filtersets): Add `object_type_id` filter for Jobs Introduce a new `object_type_id` filter to enhance filtering by object type for Jobs. Update related forms and fieldsets to incorporate the new filter for better usability and consistency. Fixes #20653 --- netbox/core/filtersets.py | 3 +++ netbox/core/forms/filtersets.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/netbox/core/filtersets.py b/netbox/core/filtersets.py index 391ac02f7d0..7b8fd920d59 100644 --- a/netbox/core/filtersets.py +++ b/netbox/core/filtersets.py @@ -80,6 +80,9 @@ class JobFilterSet(BaseFilterSet): method='search', label=_('Search'), ) + object_type_id = django_filters.ModelMultipleChoiceFilter( + queryset=ObjectType.objects.with_feature('jobs'), + ) object_type = ContentTypeFilter() created = django_filters.DateTimeFilter() created__before = django_filters.DateTimeFilter( diff --git a/netbox/core/forms/filtersets.py b/netbox/core/forms/filtersets.py index 0f25932e021..f9310a70c93 100644 --- a/netbox/core/forms/filtersets.py +++ b/netbox/core/forms/filtersets.py @@ -70,13 +70,13 @@ class JobFilterForm(SavedFiltersMixin, FilterForm): model = Job fieldsets = ( FieldSet('q', 'filter_id'), - FieldSet('object_type', 'status', name=_('Attributes')), + FieldSet('object_type_id', 'status', name=_('Attributes')), FieldSet( 'created__before', 'created__after', 'scheduled__before', 'scheduled__after', 'started__before', 'started__after', 'completed__before', 'completed__after', 'user', name=_('Creation') ), ) - object_type = ContentTypeChoiceField( + object_type_id = ContentTypeChoiceField( label=_('Object Type'), queryset=ObjectType.objects.with_feature('jobs'), required=False,