Closes #14326: Move form mixins (#14327)

* Move form mixins from extras app to netbox app

* Remove obsolete extras/admin.py

netbox/core/forms/filtersets.py

@@ -4,8 +4,8 @@ from django.utils.translation import gettext_lazy as _
 
 from core.choices import *
 from core.models import *
-from extras.forms.mixins import SavedFiltersMixin
 from netbox.forms import NetBoxModelFilterSetForm
+from netbox.forms.mixins import SavedFiltersMixin
 from netbox.utils import get_data_backend_choices
 from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES, FilterForm
 from utilities.forms.fields import ContentTypeChoiceField, DynamicModelMultipleChoiceField

netbox/dcim/forms/bulk_create.py

@@ -1,9 +1,9 @@
 from django import forms
+from django.utils.translation import gettext_lazy as _
 
 from dcim.models import *
-from django.utils.translation import gettext_lazy as _
-from extras.forms import CustomFieldsMixin
 from extras.models import Tag
+from netbox.forms.mixins import CustomFieldsMixin
 from utilities.forms import BootstrapMixin, form_from_model
 from utilities.forms.fields import DynamicModelMultipleChoiceField, ExpandableNameField
 from .object_create import ComponentCreateForm

netbox/extras/admin.py

@@ -1,2 +0,0 @@
-# TODO: Removing this import triggers an import loop due to how form mixins are currently organized
-from .forms import ConfigRevisionForm

netbox/extras/forms/__init__.py

@@ -3,5 +3,4 @@ from .filtersets import *
 from .bulk_edit import *
 from .bulk_import import *
 from .misc import *
-from .mixins import *
 from .scripts import *

netbox/extras/forms/filtersets.py

@@ -7,6 +7,7 @@ from dcim.models import DeviceRole, DeviceType, Location, Platform, Region, Site
 from extras.choices import *
 from extras.models import *
 from netbox.forms.base import NetBoxModelFilterSetForm
+from netbox.forms.mixins import SavedFiltersMixin
 from tenancy.models import Tenant, TenantGroup
 from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES, FilterForm, add_blank_choice
 from utilities.forms.fields import (
@@ -14,7 +15,6 @@ from utilities.forms.fields import (
 )
 from utilities.forms.widgets import APISelectMultiple, DateTimePicker
 from virtualization.models import Cluster, ClusterGroup, ClusterType
-from .mixins import *
 
 __all__ = (
     'ConfigContextFilterForm',

netbox/netbox/forms/base.py

@@ -4,11 +4,11 @@ from django.db.models import Q
 from django.utils.translation import gettext_lazy as _
 
 from extras.choices import *
-from extras.forms.mixins import CustomFieldsMixin, SavedFiltersMixin, TagsMixin
 from extras.models import CustomField, Tag
 from utilities.forms import CSVModelForm
 from utilities.forms.fields import CSVModelMultipleChoiceField, DynamicModelMultipleChoiceField
 from utilities.forms.mixins import BootstrapMixin, CheckLastUpdatedMixin
+from .mixins import CustomFieldsMixin, SavedFiltersMixin, TagsMixin
 
 __all__ = (
     'NetBoxModelForm',

netbox/users/forms/filtersets.py

@@ -1,14 +1,12 @@
 from django import forms
-from extras.forms.mixins import SavedFiltersMixin
-from utilities.forms import FilterForm
-from users.models import Token
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group
 from django.utils.translation import gettext_lazy as _
 
 from netbox.forms import NetBoxModelFilterSetForm
-from users.models import NetBoxGroup, NetBoxUser, ObjectPermission
+from netbox.forms.mixins import SavedFiltersMixin
-from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES
+from users.models import NetBoxGroup, NetBoxUser, ObjectPermission, Token
+from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES, FilterForm
 from utilities.forms.fields import DynamicModelMultipleChoiceField
 from utilities.forms.widgets import DateTimePicker