Move SyncedDataMixin from extras to core

netbox/core/forms/mixins.py

@@ -0,0 +1,25 @@
+from django import forms
+from django.utils.translation import gettext as _
+
+from core.models import DataFile, DataSource
+from utilities.forms.fields import DynamicModelChoiceField
+
+__all__ = (
+    'SyncedDataMixin',
+)
+
+
+class SyncedDataMixin(forms.Form):
+    data_source = DynamicModelChoiceField(
+        queryset=DataSource.objects.all(),
+        required=False,
+        label=_('Data source')
+    )
+    data_file = DynamicModelChoiceField(
+        queryset=DataFile.objects.all(),
+        required=False,
+        label=_('File'),
+        query_params={
+            'source_id': '$data_source',
+        }
+    )

netbox/core/forms/model_forms.py

@@ -2,8 +2,8 @@ import copy
 
 from django import forms
 
+from core.forms.mixins import SyncedDataMixin
 from core.models import *
-from extras.forms.mixins import SyncedDataMixin
 from netbox.forms import NetBoxModelForm
 from netbox.registry import registry
 from utilities.forms import get_field_value

netbox/extras/forms/mixins.py

@@ -1,16 +1,14 @@
-from django.contrib.contenttypes.models import ContentType
 from django import forms
+from django.contrib.contenttypes.models import ContentType
 from django.utils.translation import gettext as _
 
-from core.models import DataFile, DataSource
-from extras.models import *
 from extras.choices import CustomFieldVisibilityChoices
-from utilities.forms.fields import DynamicModelChoiceField, DynamicModelMultipleChoiceField
+from extras.models import *
+from utilities.forms.fields import DynamicModelMultipleChoiceField
 
 __all__ = (
     'CustomFieldsMixin',
     'SavedFiltersMixin',
-    'SyncedDataMixin',
 )
 
 
@@ -74,19 +72,3 @@ class SavedFiltersMixin(forms.Form):
             'usable': True,
         }
     )
-
-
-class SyncedDataMixin(forms.Form):
-    data_source = DynamicModelChoiceField(
-        queryset=DataSource.objects.all(),
-        required=False,
-        label=_('Data source')
-    )
-    data_file = DynamicModelChoiceField(
-        queryset=DataFile.objects.all(),
-        required=False,
-        label=_('File'),
-        query_params={
-            'source_id': '$data_source',
-        }
-    )

netbox/extras/forms/model_forms.py

@@ -5,9 +5,9 @@ from django.db.models import Q
 from django.contrib.contenttypes.models import ContentType
 from django.utils.translation import gettext as _
 
+from core.forms.mixins import SyncedDataMixin
 from dcim.models import DeviceRole, DeviceType, Location, Platform, Region, Site, SiteGroup
 from extras.choices import *
-from extras.forms.mixins import SyncedDataMixin
 from extras.models import *
 from extras.utils import FeatureQuery
 from netbox.forms import NetBoxModelForm

netbox/utilities/forms/bulk_import.py

@@ -6,7 +6,7 @@ import yaml
 from django import forms
 from django.utils.translation import gettext as _
 
-from extras.forms.mixins import SyncedDataMixin
+from core.forms.mixins import SyncedDataMixin
 from utilities.choices import ImportFormatChoices
 from utilities.forms.utils import parse_csv
 from ..choices import ImportMethodChoices