From 5f1f8ee73badca4797e0945837d41ca8d96b1d20 Mon Sep 17 00:00:00 2001
From: John Anderson <lampwins@gmail.com>
Date: Thu, 10 Jan 2019 17:50:06 -0500
Subject: [PATCH] Circuits Select2 forms

---
 netbox/circuits/forms.py                      | 88 +++++++++++++------
 .../virtualization/virtualmachine_list.html   | 29 ------
 2 files changed, 62 insertions(+), 55 deletions(-)

diff --git a/netbox/circuits/forms.py b/netbox/circuits/forms.py
index 0c31e78d6..a15960857 100644
--- a/netbox/circuits/forms.py
+++ b/netbox/circuits/forms.py
@@ -1,5 +1,4 @@
 from django import forms
-from django.db.models import Count
 from taggit.forms import TagField
 
 from dcim.models import Site
@@ -7,8 +6,8 @@ from extras.forms import AddRemoveTagsForm, CustomFieldForm, CustomFieldBulkEdit
 from tenancy.forms import TenancyForm
 from tenancy.models import Tenant
 from utilities.forms import (
-    AnnotatedMultipleChoiceField, add_blank_choice, BootstrapMixin, CommentField, CSVChoiceField, FilterChoiceField,
-    SmallTextarea, SlugField,
+    APISelect, APISelectMultiple, add_blank_choice, BootstrapMixin, CommentField, CSVChoiceField,
+    FilterChoiceField, SmallTextarea, SlugField, StaticSelect2, StaticSelect2Multiple
 )
 from .constants import CIRCUIT_STATUS_CHOICES
 from .models import Circuit, CircuitTermination, CircuitType, Provider
@@ -107,7 +106,11 @@ class ProviderFilterForm(BootstrapMixin, CustomFieldFilterForm):
     )
     site = FilterChoiceField(
         queryset=Site.objects.all(),
-        to_field_name='slug'
+        to_field_name='slug',
+        widget=APISelect(
+            api_url="/api/dcim/sites/",
+            value_field="slug",
+        )
     )
     asn = forms.IntegerField(
         required=False,
@@ -161,6 +164,16 @@ class CircuitForm(BootstrapMixin, TenancyForm, CustomFieldForm):
             'install_date': "Format: YYYY-MM-DD",
             'commit_rate': "Committed rate",
         }
+        widgets = {
+            'provider': APISelect(
+                api_url="/api/circuits/providers/"
+            ),
+            'type': APISelect(
+                api_url="/api/circuits/circuit-types/"
+            ),
+            'status': StaticSelect2(),
+
+        }
 
 
 class CircuitCSVForm(forms.ModelForm):
@@ -209,20 +222,30 @@ class CircuitBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEdit
     )
     type = forms.ModelChoiceField(
         queryset=CircuitType.objects.all(),
-        required=False
+        required=False,
+        widget=APISelect(
+            api_url="/api/circuits/circuit-types/"
+        )
     )
     provider = forms.ModelChoiceField(
         queryset=Provider.objects.all(),
-        required=False
+        required=False,
+        widget=APISelect(
+            api_url="/api/circuits/providers/"
+        )
     )
     status = forms.ChoiceField(
         choices=add_blank_choice(CIRCUIT_STATUS_CHOICES),
         required=False,
-        initial=''
+        initial='',
+        widget=StaticSelect2()
     )
     tenant = forms.ModelChoiceField(
         queryset=Tenant.objects.all(),
-        required=False
+        required=False,
+        widget=APISelect(
+            api_url="/api/tenancy/tenants/"
+        )
     )
     commit_rate = forms.IntegerField(
         required=False,
@@ -249,35 +272,45 @@ class CircuitFilterForm(BootstrapMixin, CustomFieldFilterForm):
         label='Search'
     )
     type = FilterChoiceField(
-        queryset=CircuitType.objects.annotate(
-            filter_count=Count('circuits')
-        ),
-        to_field_name='slug'
+        queryset=CircuitType.objects.all(),
+        to_field_name='slug',
+        widget=APISelectMultiple(
+            api_url="/api/circuits/circuit-types/",
+            value_field="slug",
+        )
     )
     provider = FilterChoiceField(
-        queryset=Provider.objects.annotate(
-            filter_count=Count('circuits')
-        ),
-        to_field_name='slug'
+        queryset=Provider.objects.all(),
+        to_field_name='slug',
+        widget=APISelectMultiple(
+            api_url="/api/circuits/providers/",
+            value_field="slug",
+        )
     )
-    status = AnnotatedMultipleChoiceField(
+    status = forms.MultipleChoiceField(
         choices=CIRCUIT_STATUS_CHOICES,
         annotate=Circuit.objects.all(),
         annotate_field='status',
-        required=False
+        required=False,
+        widget=StaticSelect2Multiple()
     )
     tenant = FilterChoiceField(
-        queryset=Tenant.objects.annotate(
-            filter_count=Count('circuits')
-        ),
+        queryset=Tenant.objects.all(),
         to_field_name='slug',
-        null_label='-- None --'
+        null_label='-- None --',
+        widget=APISelectMultiple(
+            api_url="/api/tenancy/tenants/",
+            value_field="slug",
+            null_option=True,
+        )
     )
     site = FilterChoiceField(
-        queryset=Site.objects.annotate(
-            filter_count=Count('circuit_terminations')
-        ),
-        to_field_name='slug'
+        queryset=Site.objects.all(),
+        to_field_name='slug',
+        widget=APISelectMultiple(
+            api_url="/api/dcim/sites/",
+            value_field="slug",
+        )
     )
     commit_rate = forms.IntegerField(
         required=False,
@@ -304,4 +337,7 @@ class CircuitTerminationForm(BootstrapMixin, forms.ModelForm):
         }
         widgets = {
             'term_side': forms.HiddenInput(),
+            'site': APISelect(
+                api_url="/api/dcim/sites/"
+            )
         }
diff --git a/netbox/templates/virtualization/virtualmachine_list.html b/netbox/templates/virtualization/virtualmachine_list.html
index bf2961fd8..0ca54edd1 100644
--- a/netbox/templates/virtualization/virtualmachine_list.html
+++ b/netbox/templates/virtualization/virtualmachine_list.html
@@ -20,32 +20,3 @@
     </div>
 </div>
 {% endblock %}
-
-{% block javascript %}
-<script type="text/javascript">
-$(document).ready(function() {
-
-    var cluster_group_list = $('#id_cluster_group');
-    var cluster_list = $('#id_cluster_id');
-
-    // Update cluster options based on selected group
-    cluster_group_list.change(function() {
-        var selected_groups = $(this).val();
-        if (selected_groups) {
-            cluster_list.empty();
-            $.ajax({
-                url: netbox_api_path + 'virtualization/clusters/?limit=500&group=' + selected_groups.join('&group='),
-                dataType: 'json',
-                success: function (response, status) {
-                    $.each(response["results"], function (index, cluster) {
-                        var option = $("<option></option>").attr("value", cluster.id).text(cluster.name);
-                        cluster_list.append(option);
-                    });
-                }
-            });
-        }
-    });
-
-});
-</script>
-{% endblock %}