fixed coords check

netbox_topology_views/__init__.py

@@ -4,7 +4,7 @@ class TopologyViewsConfig(PluginConfig):
     name = 'netbox_topology_views'
     verbose_name = 'Topology views'
     description = 'An plugin to render topology maps'
-    version = '1.0.0-alpha.3'
+    version = '1.0.0-alpha.6'
     author = 'Mattijs Vanhaverbeke'
     author_email = 'author@example.com'
     base_url = 'netbox_topology_views'

netbox_topology_views/api/views.py

@@ -12,15 +12,6 @@ from circuits.models import Circuit
 from extras.models import Tag
 
 
-ignore_cable_type_raw = settings.PLUGINS_CONFIG["netbox_topology_views"]["ignore_cable_type"]
-ignore_cable_type = ignore_cable_type_raw.split(",")
-
-preselected_device_roles_raw = settings.PLUGINS_CONFIG["netbox_topology_views"]["preselected_device_roles"]
-preselected_device_roles = preselected_device_roles_raw.split(",")
-
-preselected_tags_raw = settings.PLUGINS_CONFIG["netbox_topology_views"]["preselected_tags"]
-preselected_tags = preselected_tags_raw.split(",")
-
 class TopologyViewsRootView(APIRootView):
     def get_view_name(self):
         return 'TopologyViews'

netbox_topology_views/views.py

@@ -10,7 +10,6 @@ from .forms import DeviceFilterForm
 from .filters import DeviceFilterSet
 
 import json
-import distutils
 
 from dcim.models import Device, Cable, DeviceRole, DeviceType
 from extras.models import Tag
@@ -151,10 +150,11 @@ def get_topology_data(queryset, hide_unconnected):
 
                 if "coordinates" in qs_device.custom_field_data:
                     if qs_device.custom_field_data["coordinates"] is not None:
-                        cords =  qs_device.custom_field_data["coordinates"].split(";")
-                        node["x"] = int(cords[0])
-                        node["y"] = int(cords[1])
-                        node["physics"] = False
+                        if ';' in qs_device.custom_field_data["coordinates"]:
+                            cords =  qs_device.custom_field_data["coordinates"].split(";")
+                            node["x"] = int(cords[0])
+                            node["y"] = int(cords[1])
+                            node["physics"] = False
                 nodes.append(node)
 
     results = {}
@@ -182,7 +182,7 @@ class TopologyHomeView(PermissionRequiredMixin, View):
                     hide_unconnected = True
 
             if 'draw_init' in request.GET:
-                if bool(distutils.util.strtobool(request.GET["draw_init"])):
+                if request.GET["draw_init"].lower() == 'true':
                     topo_data = get_topology_data(self.queryset, hide_unconnected)
             else:
                 topo_data = get_topology_data(self.queryset, hide_unconnected)

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "netbox_topology_views",
-  "version": "1.0.0-alpha.3",
+  "version": "1.0.0-alpha.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "netbox_topology_views",
-  "version": "1.0.0-alpha.3",
+  "version": "1.0.0-alpha.6",
   "scripts": {
     "resources": "gulp build",
     "resources_dev": "gulp build_dev"

setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='netbox-topology-views',
-    version='1.0.0-alpha.3',
+    version='1.0.0-alpha.6',
     description='An NetBox plugin to create Topology maps',
     url='https://github.com/mattieserver/netbox-topology-views',
     author='Mattijs Vanhaverbeke',