drygdryg/netbox-plugin-device-map
1
0
Fork 0
mirror of https://github.com/drygdryg/netbox-plugin-device-map.git synced 2024-11-29 21:50:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to fix the filter by role (no longer device_role)

Browse Source
This commit is contained in:
Seb Harrington 2024-05-03 15:49:07 +01:00
parent 69fbd6aef9
commit 974870adeb
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
netbox_device_map/views.py
View File

@ -31,7 +31,7 @@ class MapView(PermissionRequiredMixin, View):
#interfaces = interfaces.filter(Q(untagged_vlan=vlan) | Q(tagged_vlans=vlan)) #interfaces = interfaces.filter(Q(untagged_vlan=vlan) | Q(tagged_vlans=vlan))
devices = Device.objects.filter(interfaces__in=interfaces).distinct() devices = Device.objects.filter(interfaces__in=interfaces).distinct()
if device_roles := form.cleaned_data['device_roles']: if device_roles := form.cleaned_data['device_roles']:
devices = devices.filter(device_role__in=device_roles) devices = devices.filter(role=device_roles)
geolocated_devices = {d: coords for d in devices if (coords := get_device_location(d))} geolocated_devices = {d: coords for d in devices if (coords := get_device_location(d))}
non_geolocated_devices = set(devices) - set(geolocated_devices.keys()) non_geolocated_devices = set(devices) - set(geolocated_devices.keys())
@ -66,8 +66,7 @@ class ConnectedCpeAjaxView(PermissionRequiredMixin, View):
# .filter(device_role__name=plugin_settings['cpe_device_role']).order_by() # .filter(device_role__name=plugin_settings['cpe_device_role']).order_by()
connected_devices = [dict(id=d.id, name=d.name, url=d.get_absolute_url(), comments=d.comments) connected_devices = [dict(id=d.id, name=d.name, url=d.get_absolute_url(), comments=d.comments)
for d in connected_devices_qs] for d in connected_devices_qs]
# Sorting list of CPE devices by the sequence of integers contained in the comments
connected_devices.sort(key=lambda d: tuple(int(n) for n in INTEGER_REGEXP.findall(d['comments'])))
return JsonResponse(dict(status=True, cpe_devices=connected_devices, return JsonResponse(dict(status=True, cpe_devices=connected_devices,
device_type=f'{device.device_type.manufacturer.name} {device.device_type.model}')) device_type=f'{device.device_type.manufacturer.name} {device.device_type.model}'))
else: else: