From 7976ef9b9695ecda43113117bb4db4d69f525396 Mon Sep 17 00:00:00 2001
From: Abhimanyu Saharan <desk.abhimanyu@gmail.com>
Date: Fri, 12 Aug 2022 17:42:51 +0530
Subject: [PATCH] Fixed various filtering (#58)

---
 netbox_access_lists/forms/models.py                    |  6 +++++-
 netbox_access_lists/template_content.py                | 10 +++++++---
 .../templates/inc/assigned_interface/access_lists.html |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/netbox_access_lists/forms/models.py b/netbox_access_lists/forms/models.py
index 0c0a938..451462e 100644
--- a/netbox_access_lists/forms/models.py
+++ b/netbox_access_lists/forms/models.py
@@ -71,12 +71,16 @@ class AccessListForm(NetBoxModelForm):
     site = DynamicModelChoiceField(
         queryset=Site.objects.all(),
         required=False,
+        query_params={
+            "region_id": "$region",
+            "group_id": "$site_group",
+        },
     )
     device = DynamicModelChoiceField(
         queryset=Device.objects.all(),
         required=False,
         query_params={
-            "region": "$region",
+            "region_id": "$region",
             "group_id": "$site_group",
             "site_id": "$site",
         },
diff --git a/netbox_access_lists/template_content.py b/netbox_access_lists/template_content.py
index fa17039..c2738d6 100644
--- a/netbox_access_lists/template_content.py
+++ b/netbox_access_lists/template_content.py
@@ -30,9 +30,13 @@ class ACLInterfaceAssignments(PluginTemplateExtension):
             "inc/assigned_interface/access_lists.html",
             extra_context={
                 "acl_interface_assignments": acl_interface_assignments,
-                "type": ctype.model
-                if ctype.model == "device"
-                else ctype.name.replace(" ", "_"),
+                "type": ctype.model,
+                "parent_type": "device"
+                if ctype.model == "interface"
+                else "virtual_machine",
+                "parent_id": obj.device.pk
+                if ctype.model == "interface"
+                else obj.virtual_machine.pk,
             },
         )
 
diff --git a/netbox_access_lists/templates/inc/assigned_interface/access_lists.html b/netbox_access_lists/templates/inc/assigned_interface/access_lists.html
index 512c1cf..046da49 100644
--- a/netbox_access_lists/templates/inc/assigned_interface/access_lists.html
+++ b/netbox_access_lists/templates/inc/assigned_interface/access_lists.html
@@ -6,7 +6,7 @@
             {% include 'inc/assigned_interface/assigned_access_lists.html' %}
         </div>
         <div class="card-footer text-end noprint">
-            <a href="{% url 'plugins:netbox_access_lists:aclinterfaceassignment_add' %}?{{ type }}={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-primary">
+            <a href="{% url 'plugins:netbox_access_lists:aclinterfaceassignment_add' %}?{{ parent_type }}={{ parent_id }}&{{ type }}={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-primary">
                 <i class="mdi mdi-plus-thick"></i> Assign Access List
             </a>
         </div>