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

Revert "Refactor ChangeLoggedModelFilterSet"

This reverts commit 28de9b89132e063597e59e6c518adc260ab5c306.
jeremystretch 4 лет назад
Родитель
Сommit
eb00e20269
1 измененных файлов с 20 добавлено и 28 удалено
  1. 20 28
      netbox/netbox/filtersets.py

+ 20 - 28
netbox/netbox/filtersets.py

@@ -23,31 +23,6 @@ __all__ = (
 )
 )
 
 
 
 
-#
-# Mixins
-#
-
-class ChangeLoggedModelMixin:
-    created = django_filters.DateFilter()
-    created__gte = django_filters.DateFilter(
-        field_name='created',
-        lookup_expr='gte'
-    )
-    created__lte = django_filters.DateFilter(
-        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'
-    )
-
-
 #
 #
 # FilterSets
 # FilterSets
 #
 #
@@ -221,11 +196,28 @@ class BaseFilterSet(django_filters.FilterSet):
         return filters
         return filters
 
 
 
 
-class ChangeLoggedModelFilterSet(ChangeLoggedModelMixin, BaseFilterSet):
-    pass
+class ChangeLoggedModelFilterSet(BaseFilterSet):
+    created = django_filters.DateFilter()
+    created__gte = django_filters.DateFilter(
+        field_name='created',
+        lookup_expr='gte'
+    )
+    created__lte = django_filters.DateFilter(
+        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'
+    )
 
 
 
 
-class PrimaryModelFilterSet(ChangeLoggedModelMixin, BaseFilterSet):
+class PrimaryModelFilterSet(ChangeLoggedModelFilterSet):
     tag = TagFilter()
     tag = TagFilter()
 
 
     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):