Explorar o código

Closes #9858: ChangeLoggedModelFilterSet cleanup

jeremystretch %!s(int64=3) %!d(string=hai) anos
pai
achega
04fb0bd51c
Modificáronse 2 ficheiros con 7 adicións e 20 borrados
  1. 5 18
      netbox/netbox/filtersets.py
  2. 2 2
      netbox/utilities/testing/filtersets.py

+ 5 - 18
netbox/netbox/filtersets.py

@@ -197,24 +197,11 @@ class BaseFilterSet(django_filters.FilterSet):
 
 
 class ChangeLoggedModelFilterSet(BaseFilterSet):
-    created = django_filters.DateTimeFilter()
-    created__gte = django_filters.DateTimeFilter(
-        field_name='created',
-        lookup_expr='gte'
-    )
-    created__lte = django_filters.DateTimeFilter(
-        field_name='created',
-        lookup_expr='lte'
-    )
-    last_updated = django_filters.DateTimeFilter()
-    last_updated__gte = django_filters.DateTimeFilter(
-        field_name='last_updated',
-        lookup_expr='gte'
-    )
-    last_updated__lte = django_filters.DateTimeFilter(
-        field_name='last_updated',
-        lookup_expr='lte'
-    )
+    """
+    Base FilterSet for ChangeLoggedModel classes.
+    """
+    created = filters.MultiValueDateTimeFilter()
+    last_updated = filters.MultiValueDateTimeFilter()
 
 
 class NetBoxModelFilterSet(ChangeLoggedModelFilterSet):

+ 2 - 2
netbox/utilities/testing/filtersets.py

@@ -25,11 +25,11 @@ class ChangeLoggedFilterSetTests(BaseFilterSetTests):
     def test_created(self):
         pk_list = self.queryset.values_list('pk', flat=True)[:2]
         self.queryset.filter(pk__in=pk_list).update(created=datetime(2021, 1, 1, 0, 0, 0, tzinfo=timezone.utc))
-        params = {'created': '2021-01-01T00:00:00'}
+        params = {'created': ['2021-01-01T00:00:00']}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_last_updated(self):
         pk_list = self.queryset.values_list('pk', flat=True)[:2]
         self.queryset.filter(pk__in=pk_list).update(last_updated=datetime(2021, 1, 2, 0, 0, 0, tzinfo=timezone.utc))
-        params = {'last_updated': '2021-01-02T00:00:00'}
+        params = {'last_updated': ['2021-01-02T00:00:00']}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)