mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Fixes #632: Use semicolons instead of commas to separate regexes in topology maps

Browse Source
This commit is contained in:
Jeremy Stretch
2016-11-03 14:49:02 -04:00
parent 96eaea7db9
commit ea92e92c5a
4 changed files with 37 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/extras/api/views.py
View File

@@ -80,7 +80,7 @@ class TopologyMapView(APIView):
# Add each device to the graph
devices = []
for query in device_set.split(','):
for query in device_set.split(';'): # Split regexes on semicolons
devices += Device.objects.filter(name__regex=query)
for d in devices:
subgraph.node(d.name)
@@ -94,7 +94,7 @@ class TopologyMapView(APIView):
# Compile list of all devices
device_superset = Q()
for device_set in tmap.device_sets:
for query in device_set.split(','):
for query in device_set.split(';'): # Split regexes on semicolons
device_superset = device_superset | Q(name__regex=query)
# Add all connections to the graph