From c91d8bdbed2111a287370e40dd3688254f0d61ad Mon Sep 17 00:00:00 2001
From: Daniel Sheppard <dans@dansheps.com>
Date: Fri, 24 Mar 2023 14:19:33 -0500
Subject: [PATCH] #9047 - Move to new selector types

---
 netbox/circuits/forms/model_forms.py          | 29 ++++++-------------
 .../circuits/circuittermination_edit.html     |  1 -
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/netbox/circuits/forms/model_forms.py b/netbox/circuits/forms/model_forms.py
index 729aaa95b..2c26f550b 100644
--- a/netbox/circuits/forms/model_forms.py
+++ b/netbox/circuits/forms/model_forms.py
@@ -41,7 +41,8 @@ class ProviderForm(NetBoxModelForm):
 
 class ProviderAccountForm(NetBoxModelForm):
     provider = DynamicModelChoiceField(
-        queryset=Provider.objects.all()
+        queryset=Provider.objects.all(),
+        selector=True
     )
     comments = CommentField()
 
@@ -86,13 +87,6 @@ class CircuitTypeForm(NetBoxModelForm):
 
 
 class CircuitForm(TenancyForm, NetBoxModelForm):
-    provider = DynamicModelChoiceField(
-        required=False,
-        queryset=Provider.objects.all(),
-        initial_params={
-            'accounts': '$provider_account'
-        },
-    )
     provider_account = DynamicModelChoiceField(
         queryset=ProviderAccount.objects.all(),
         initial_params={
@@ -100,7 +94,8 @@ class CircuitForm(TenancyForm, NetBoxModelForm):
         },
         query_params={
             'provider': '$provider',
-        }
+        },
+        selector=True
     )
     type = DynamicModelChoiceField(
         queryset=CircuitType.objects.all()
@@ -108,7 +103,7 @@ class CircuitForm(TenancyForm, NetBoxModelForm):
     comments = CommentField()
 
     fieldsets = (
-        ('Circuit', ('provider', 'provider_account', 'cid', 'type', 'status', 'description', 'tags')),
+        ('Circuit', ('provider_account', 'cid', 'type', 'status', 'description', 'tags')),
         ('Service Parameters', ('install_date', 'termination_date', 'commit_rate')),
         ('Tenancy', ('tenant_group', 'tenant')),
     )
@@ -116,7 +111,7 @@ class CircuitForm(TenancyForm, NetBoxModelForm):
     class Meta:
         model = Circuit
         fields = [
-            'cid', 'type', 'provider', 'provider_account', 'status', 'install_date', 'termination_date', 'commit_rate',
+            'cid', 'type', 'provider_account', 'status', 'install_date', 'termination_date', 'commit_rate',
             'description', 'tenant_group', 'tenant', 'comments', 'tags',
         ]
         widgets = {
@@ -127,13 +122,6 @@ class CircuitForm(TenancyForm, NetBoxModelForm):
 
 
 class CircuitTerminationForm(NetBoxModelForm):
-    provider = DynamicModelChoiceField(
-        queryset=Provider.objects.all(),
-        required=False,
-        initial_params={
-            'accounts': '$provider_account'
-        }
-    )
     provider_account = DynamicModelChoiceField(
         queryset=ProviderAccount.objects.all(),
         required=False,
@@ -142,7 +130,8 @@ class CircuitTerminationForm(NetBoxModelForm):
         },
         query_params={
             'provider': '$provider',
-        }
+        },
+        selector=True
     )
     circuit = DynamicModelChoiceField(
         queryset=Circuit.objects.all(),
@@ -164,7 +153,7 @@ class CircuitTerminationForm(NetBoxModelForm):
     class Meta:
         model = CircuitTermination
         fields = [
-            'provider', 'provider_account', 'circuit', 'term_side', 'site', 'provider_network', 'mark_connected',
+            'provider_account', 'circuit', 'term_side', 'site', 'provider_network', 'mark_connected',
             'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info', 'description', 'tags',
         ]
         widgets = {
diff --git a/netbox/templates/circuits/circuittermination_edit.html b/netbox/templates/circuits/circuittermination_edit.html
index e50f21786..2fac2a35b 100644
--- a/netbox/templates/circuits/circuittermination_edit.html
+++ b/netbox/templates/circuits/circuittermination_edit.html
@@ -7,7 +7,6 @@
     <div class="row mb-2">
       <h5 class="offset-sm-3">Circuit Termination</h5>
     </div>
-    {% render_field form.provider %}
     {% render_field form.provider_account %}
     {% render_field form.circuit %}
     {% render_field form.term_side %}