From bab3ccd2161f33f91bcf91344300b8667f0be40d Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 5 Aug 2026 17:09:59 -0400 Subject: [PATCH] Keep the job completion filters alongside the other scheduling fields started__* and completed__* are two halves of the same time range, so splitting them across the Scheduling and Execution field sets made a run window awkward to filter. Execution now holds only execution_time, and the grouping matches JobSchedulingPanel on the detail view. Co-Authored-By: Claude Opus 5 --- netbox/core/forms/filtersets.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/netbox/core/forms/filtersets.py b/netbox/core/forms/filtersets.py index 998564498..747e1bbee 100644 --- a/netbox/core/forms/filtersets.py +++ b/netbox/core/forms/filtersets.py @@ -78,11 +78,9 @@ class JobFilterForm(SavedFiltersMixin, FilterForm): FieldSet('object_type_id', 'status', 'queue_name', 'user', name=_('Attributes')), FieldSet( 'created__before', 'created__after', 'scheduled__before', 'scheduled__after', 'started__before', - 'started__after', name=_('Scheduling') - ), - FieldSet( - 'completed__before', 'completed__after', 'execution_time__gte', 'execution_time__lte', name=_('Execution'), + 'started__after', 'completed__before', 'completed__after', name=_('Scheduling') ), + FieldSet('execution_time__gte', 'execution_time__lte', name=_('Execution')), ) object_type_id = ContentTypeChoiceField( label=_('Object Type'),