NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-16 12:12:53 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Fix JobResultFilterset to use DateTimeField to perserve bc compat

Browse Source
This commit is contained in:
kkthxbye-code 2022-10-21 15:53:39 +02:00
parent 72ba57052a
commit 5e5228ff12
2 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
netbox/extras/filtersets.py
View File

@ -435,9 +435,33 @@ class JobResultFilterSet(BaseFilterSet):
method='search', method='search',
label='Search', label='Search',
) )
created = django_filters.DateTimeFromToRangeFilter() created = django_filters.DateTimeFilter()
completed = django_filters.DateTimeFromToRangeFilter() created__before = django_filters.DateTimeFilter(
scheduled_time = django_filters.DateTimeFromToRangeFilter() field_name='created',
lookup_expr='lte'
)
created__after = django_filters.DateTimeFilter(
field_name='created',
lookup_expr='gte'
)
completed = django_filters.DateTimeFilter()
completed__before = django_filters.DateTimeFilter(
field_name='completed',
lookup_expr='lte'
)
completed__after = django_filters.DateTimeFilter(
field_name='completed',
lookup_expr='gte'
)
scheduled_time = django_filters.DateTimeFilter()
scheduled_time__before = django_filters.DateTimeFilter(
field_name='scheduled_time',
lookup_expr='lte'
)
scheduled_time__after = django_filters.DateTimeFilter(
field_name='scheduled_time',
lookup_expr='gte'
)
status = django_filters.MultipleChoiceFilter( status = django_filters.MultipleChoiceFilter(
choices=JobResultStatusChoices, choices=JobResultStatusChoices,
null_value=None null_value=None

15
netbox/extras/forms/filtersets.py
View File

@ -70,7 +70,8 @@ class JobResultFilterForm(FilterForm):
fieldsets = ( fieldsets = (
(None, ('q',)), (None, ('q',)),
('Attributes', ('obj_type', 'status')), ('Attributes', ('obj_type', 'status')),
('Creation', ('created_before', 'created_after', 'completed_before', 'completed_after', 'scheduled_time_before', 'scheduled_time_after', 'user')), ('Creation', ('created__before', 'created__after', 'completed__before', 'completed__after',
'scheduled_time__before', 'scheduled_time__after', 'user')),
) )
obj_type = ContentTypeChoiceField( obj_type = ContentTypeChoiceField(
@ -83,27 +84,27 @@ class JobResultFilterForm(FilterForm):
choices=JobResultStatusChoices, choices=JobResultStatusChoices,
required=False required=False
) )
created_after = forms.DateTimeField( created__after = forms.DateTimeField(
required=False, required=False,
widget=DateTimePicker() widget=DateTimePicker()
) )
created_before = forms.DateTimeField( created__before = forms.DateTimeField(
required=False, required=False,
widget=DateTimePicker() widget=DateTimePicker()
) )
completed_after = forms.DateTimeField( completed__after = forms.DateTimeField(
required=False, required=False,
widget=DateTimePicker() widget=DateTimePicker()
) )
completed_before = forms.DateTimeField( completed__before = forms.DateTimeField(
required=False, required=False,
widget=DateTimePicker() widget=DateTimePicker()
) )
scheduled_time_after = forms.DateTimeField( scheduled_time__after = forms.DateTimeField(
required=False, required=False,
widget=DateTimePicker() widget=DateTimePicker()
) )
scheduled_time_before = forms.DateTimeField( scheduled_time__before = forms.DateTimeField(
required=False, required=False,
widget=DateTimePicker() widget=DateTimePicker()
) )