From eb00e202693dcccb836b3dbafa86ec254afc5d45 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Wed, 26 Jan 2022 09:03:30 -0500
Subject: [PATCH] Revert "Refactor ChangeLoggedModelFilterSet"

This reverts commit 28de9b89132e063597e59e6c518adc260ab5c306.
---
 netbox/netbox/filtersets.py | 48 ++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 28 deletions(-)

diff --git a/netbox/netbox/filtersets.py b/netbox/netbox/filtersets.py
index a109b2c70..3ddf252c7 100644
--- a/netbox/netbox/filtersets.py
+++ b/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
 #
@@ -221,11 +196,28 @@ class BaseFilterSet(django_filters.FilterSet):
         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()
 
     def __init__(self, *args, **kwargs):