Просмотр исходного кода

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 <noreply@anthropic.com>
Jeremy Stretch 2 недель назад
Родитель
Сommit
bab3ccd216
1 измененных файлов с 2 добавлено и 4 удалено
  1. 2 4
      netbox/core/forms/filtersets.py

+ 2 - 4
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'),