From 8f48ea0b261bd9b984aaeecbb8d498673934de7e Mon Sep 17 00:00:00 2001
From: Abhimanyu Saharan <desk.abhimanyu@gmail.com>
Date: Sat, 21 Jan 2023 22:28:46 +0530
Subject: [PATCH] updated forms to utilize netbox classes

---
 netbox_acls/forms/filtersets.py | 34 ++++++++-------------------------
 1 file changed, 8 insertions(+), 26 deletions(-)

diff --git a/netbox_acls/forms/filtersets.py b/netbox_acls/forms/filtersets.py
index afe25eb..d0f93e9 100644
--- a/netbox_acls/forms/filtersets.py
+++ b/netbox_acls/forms/filtersets.py
@@ -9,8 +9,7 @@ from netbox.forms import NetBoxModelFilterSetForm
 from utilities.forms import (
     ChoiceField,
     DynamicModelChoiceField,
-    StaticSelect,
-    StaticSelectMultiple,
+    DynamicModelMultipleChoiceField,
     TagFilterField,
     add_blank_choice,
 )
@@ -77,14 +76,10 @@ class AccessListFilterForm(NetBoxModelFilterSetForm):
     type = ChoiceField(
         choices=add_blank_choice(ACLTypeChoices),
         required=False,
-        initial="",
-        widget=StaticSelect(),
     )
     default_action = ChoiceField(
         choices=add_blank_choice(ACLActionChoices),
         required=False,
-        initial="",
-        widget=StaticSelect(),
         label="Default Action",
     )
     tag = TagFilterField(model)
@@ -164,8 +159,6 @@ class ACLInterfaceAssignmentFilterForm(NetBoxModelFilterSetForm):
     direction = ChoiceField(
         choices=add_blank_choice(ACLAssignmentDirectionChoices),
         required=False,
-        initial="",
-        widget=StaticSelect(),
     )
     tag = TagFilterField(model)
 
@@ -183,22 +176,18 @@ class ACLStandardRuleFilterForm(NetBoxModelFilterSetForm):
 
     model = ACLStandardRule
     tag = TagFilterField(model)
-    access_list = forms.ModelMultipleChoiceField(
+    access_list = DynamicModelMultipleChoiceField(
         queryset=AccessList.objects.all(),
         required=False,
-        widget=StaticSelectMultiple(),
     )
-    source_prefix = forms.ModelMultipleChoiceField(
+    source_prefix = DynamicModelMultipleChoiceField(
         queryset=Prefix.objects.all(),
         required=False,
-        widget=StaticSelectMultiple(),
         label="Source Prefix",
     )
-    action = forms.ChoiceField(
+    action = ChoiceField(
         choices=add_blank_choice(ACLRuleActionChoices),
         required=False,
-        initial="",
-        widget=StaticSelect(),
     )
     fieldsets = (
         (None, ("q", "tag")),
@@ -216,34 +205,27 @@ class ACLExtendedRuleFilterForm(NetBoxModelFilterSetForm):
         required=False,
     )
     tag = TagFilterField(model)
-    access_list = forms.ModelMultipleChoiceField(
+    access_list = DynamicModelMultipleChoiceField(
         queryset=AccessList.objects.all(),
         required=False,
-        widget=StaticSelectMultiple(),
     )
-    action = forms.ChoiceField(
+    action = ChoiceField(
         choices=add_blank_choice(ACLRuleActionChoices),
         required=False,
-        widget=StaticSelect(),
-        initial="",
     )
-    source_prefix = forms.ModelMultipleChoiceField(
+    source_prefix = DynamicModelMultipleChoiceField(
         queryset=Prefix.objects.all(),
         required=False,
-        widget=StaticSelectMultiple(),
         label="Source Prefix",
     )
-    desintation_prefix = forms.ModelMultipleChoiceField(
+    desintation_prefix = DynamicModelMultipleChoiceField(
         queryset=Prefix.objects.all(),
         required=False,
-        widget=StaticSelectMultiple(),
         label="Destination Prefix",
     )
     protocol = ChoiceField(
         choices=add_blank_choice(ACLProtocolChoices),
         required=False,
-        widget=StaticSelect(),
-        initial="",
     )
 
     fieldsets = (