From 71e4807cb154ed991a85b8d0a87693a49cde4e03 Mon Sep 17 00:00:00 2001
From: mattieserver <3049868+mattieserver@users.noreply.github.com>
Date: Thu, 31 Aug 2023 12:33:09 +0200
Subject: [PATCH] prepare for netbox v3.6.0 release (#366)

* prepare for netbox v3.6.0 release

* updated readme to reflect the version
---
 README.md                                          | 1 +
 netbox_topology_views/api/views.py                 | 2 +-
 netbox_topology_views/filters.py                   | 4 ++--
 netbox_topology_views/forms.py                     | 6 +++---
 netbox_topology_views/static_dev/package-lock.json | 4 ++--
 netbox_topology_views/views.py                     | 6 +++---
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 340e0c9..2ee733d 100644
--- a/README.md
+++ b/README.md
@@ -50,6 +50,7 @@ python3 manage.py collectstatic --no-input
 
 | netbox version | netbox-topology-views version |
 | -------------- | ----------------------------- |
+| >= 3.6.0       | >= v3.7.X                     |
 | >= 3.5.0       | >= v3.4.X                     |
 | >= 3.4.0       | >= v3.X.X                     |
 | >= 3.3.0       | >= v3.0.0                     |
diff --git a/netbox_topology_views/api/views.py b/netbox_topology_views/api/views.py
index 54826fc..932cb98 100644
--- a/netbox_topology_views/api/views.py
+++ b/netbox_topology_views/api/views.py
@@ -90,7 +90,7 @@ class ExportTopoToXML(PermissionRequiredMixin, ViewSet):
 
         self.filterset = DeviceFilterSet
         self.queryset = Device.objects.all().select_related(
-            "device_type", "device_role"
+            "device_type", "role"
         )
         self.queryset = self.filterset(request.GET, self.queryset).qs
 
diff --git a/netbox_topology_views/filters.py b/netbox_topology_views/filters.py
index 073fff6..f6b148e 100644
--- a/netbox_topology_views/filters.py
+++ b/netbox_topology_views/filters.py
@@ -12,8 +12,8 @@ class DeviceFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         method="search",
         label="Search",
     )
-    device_role_id = django_filters.ModelMultipleChoiceFilter(
-        field_name="device_role_id",
+    role_id = django_filters.ModelMultipleChoiceFilter(
+        field_name="role_id",
         queryset=DeviceRole.objects.all(),
         label="Role (ID)",
     )
diff --git a/netbox_topology_views/forms.py b/netbox_topology_views/forms.py
index 26064f0..f6ee86a 100644
--- a/netbox_topology_views/forms.py
+++ b/netbox_topology_views/forms.py
@@ -56,7 +56,7 @@ class DeviceFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
         (
             None,
             (
-                "device_role_id",
+                "role_id",
                 "id",
                 "status",
             ),
@@ -71,7 +71,7 @@ class DeviceFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     region_id = DynamicModelMultipleChoiceField(
         queryset=Region.objects.all(), required=False, label=_("Region")
     )
-    device_role_id = DynamicModelMultipleChoiceField(
+    role_id = DynamicModelMultipleChoiceField(
         queryset=DeviceRole.objects.all(), required=False, label=_("Device Role")
     )
     id = DynamicModelMultipleChoiceField(
@@ -82,7 +82,7 @@ class DeviceFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
             "location_id": "$location_id",
             "region_id": "$region_id",
             "site_id": "$site_id",
-            "role_id": "$device_role_id",
+            "role_id": "$role_id",
         },
     )
     site_id = DynamicModelMultipleChoiceField(
diff --git a/netbox_topology_views/static_dev/package-lock.json b/netbox_topology_views/static_dev/package-lock.json
index 205583c..b98bbd9 100644
--- a/netbox_topology_views/static_dev/package-lock.json
+++ b/netbox_topology_views/static_dev/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "netbox_topology_views",
-  "version": "3.6.0",
+  "version": "3.6.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "netbox_topology_views",
-      "version": "3.6.0",
+      "version": "3.6.2",
       "dependencies": {
         "vis-data": "^7.1.6",
         "vis-network": "^9.1.6",
diff --git a/netbox_topology_views/views.py b/netbox_topology_views/views.py
index 646b6d2..7a66d59 100644
--- a/netbox_topology_views/views.py
+++ b/netbox_topology_views/views.py
@@ -67,7 +67,7 @@ from netbox_topology_views.utils import (
 def get_image_for_entity(entity: Union[Device, Circuit, PowerPanel, PowerFeed]):
     is_device = isinstance(entity, Device)
     query = (
-        {"object_id": entity.device_role_id}
+        {"object_id": entity.role_id}
         if is_device
         else {"content_type_id": ContentType.objects.get_for_model(entity).pk}
     )
@@ -653,7 +653,7 @@ class TopologyHomeView(PermissionRequiredMixin, View):
     def get(self, request):
         self.filterset = DeviceFilterSet
         self.queryset = Device.objects.all().select_related(
-            "device_type", "device_role"
+            "device_type", "role"
         )
         self.queryset = self.filterset(request.GET, self.queryset).qs
         self.model = self.queryset.model
@@ -694,7 +694,7 @@ class TopologyHomeView(PermissionRequiredMixin, View):
             preselected_tags = IndividualOptions.objects.get(id=individualOptions.id).preselected_tags.all().values_list(Lower('name'), flat=True)
 
             q = QueryDict(mutable=True)
-            q.setlist("device_role_id", list(preselected_device_roles))
+            q.setlist("role_id", list(preselected_device_roles))
             q.setlist("tag", list(preselected_tags))
 
             if individualOptions.save_coords: q['save_coords'] = "on"