MrBlake/mrb-netbox-topology-views
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

prepare for netbox v3.6.0 release (#366)

Browse Source 
* prepare for netbox v3.6.0 release

* updated readme to reflect the version
This commit is contained in:
mattieserver
2023-08-31 12:33:09 +02:00
committed by GitHub
parent dfbe26318f
commit 71e4807cb1
6 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1
View File
@@ -50,6 +50,7 @@ python3 manage.py collectstatic --no-input
| netbox version | netbox-topology-views version | | netbox version | netbox-topology-views version |
| -------------- | ----------------------------- | | -------------- | ----------------------------- |
| >= 3.6.0 | >= v3.7.X |
| >= 3.5.0 | >= v3.4.X | | >= 3.5.0 | >= v3.4.X |
| >= 3.4.0 | >= v3.X.X | | >= 3.4.0 | >= v3.X.X |
| >= 3.3.0 | >= v3.0.0 | | >= 3.3.0 | >= v3.0.0 |
netbox_topology_views/api/views.py
+1 -1
View File
@@ -90,7 +90,7 @@ class ExportTopoToXML(PermissionRequiredMixin, ViewSet):
self.filterset = DeviceFilterSet self.filterset = DeviceFilterSet
self.queryset = Device.objects.all().select_related( self.queryset = Device.objects.all().select_related(
"device_type", "device_role" "device_type", "role"
) )
self.queryset = self.filterset(request.GET, self.queryset).qs self.queryset = self.filterset(request.GET, self.queryset).qs
netbox_topology_views/filters.py
+2 -2
View File
@@ -12,8 +12,8 @@ class DeviceFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
method="search", method="search",
label="Search", label="Search",
) )
device_role_id = django_filters.ModelMultipleChoiceFilter( role_id = django_filters.ModelMultipleChoiceFilter(
field_name="device_role_id", field_name="role_id",
queryset=DeviceRole.objects.all(), queryset=DeviceRole.objects.all(),
label="Role (ID)", label="Role (ID)",
) )
netbox_topology_views/forms.py
+3 -3
View File
@@ -56,7 +56,7 @@ class DeviceFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
( (
None, None,
( (
"device_role_id", "role_id",
"id", "id",
"status", "status",
), ),
@@ -71,7 +71,7 @@ class DeviceFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
region_id = DynamicModelMultipleChoiceField( region_id = DynamicModelMultipleChoiceField(
queryset=Region.objects.all(), required=False, label=_("Region") queryset=Region.objects.all(), required=False, label=_("Region")
) )
device_role_id = DynamicModelMultipleChoiceField( role_id = DynamicModelMultipleChoiceField(
queryset=DeviceRole.objects.all(), required=False, label=_("Device Role") queryset=DeviceRole.objects.all(), required=False, label=_("Device Role")
) )
id = DynamicModelMultipleChoiceField( id = DynamicModelMultipleChoiceField(
@@ -82,7 +82,7 @@ class DeviceFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
"location_id": "$location_id", "location_id": "$location_id",
"region_id": "$region_id", "region_id": "$region_id",
"site_id": "$site_id", "site_id": "$site_id",
"role_id": "$device_role_id", "role_id": "$role_id",
}, },
) )
site_id = DynamicModelMultipleChoiceField( site_id = DynamicModelMultipleChoiceField(
netbox_topology_views/static_dev/package-lock.json
Generated
+2 -2
View File
@@ -1,12 +1,12 @@
{ {
"name": "netbox_topology_views", "name": "netbox_topology_views",
"version": "3.6.0", "version": "3.6.2",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "netbox_topology_views", "name": "netbox_topology_views",
"version": "3.6.0", "version": "3.6.2",
"dependencies": { "dependencies": {
"vis-data": "^7.1.6", "vis-data": "^7.1.6",
"vis-network": "^9.1.6", "vis-network": "^9.1.6",
netbox_topology_views/views.py
+3 -3
View File
@@ -67,7 +67,7 @@ from netbox_topology_views.utils import (
def get_image_for_entity(entity: Union[Device, Circuit, PowerPanel, PowerFeed]): def get_image_for_entity(entity: Union[Device, Circuit, PowerPanel, PowerFeed]):
is_device = isinstance(entity, Device) is_device = isinstance(entity, Device)
query = ( query = (
{"object_id": entity.device_role_id} {"object_id": entity.role_id}
if is_device if is_device
else {"content_type_id": ContentType.objects.get_for_model(entity).pk} else {"content_type_id": ContentType.objects.get_for_model(entity).pk}
) )
@@ -653,7 +653,7 @@ class TopologyHomeView(PermissionRequiredMixin, View):
def get(self, request): def get(self, request):
self.filterset = DeviceFilterSet self.filterset = DeviceFilterSet
self.queryset = Device.objects.all().select_related( self.queryset = Device.objects.all().select_related(
"device_type", "device_role" "device_type", "role"
) )
self.queryset = self.filterset(request.GET, self.queryset).qs self.queryset = self.filterset(request.GET, self.queryset).qs
self.model = self.queryset.model 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) preselected_tags = IndividualOptions.objects.get(id=individualOptions.id).preselected_tags.all().values_list(Lower('name'), flat=True)
q = QueryDict(mutable=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)) q.setlist("tag", list(preselected_tags))
if individualOptions.save_coords: q['save_coords'] = "on" if individualOptions.save_coords: q['save_coords'] = "on"