Compare commits

...
Author SHA1 Message Date
Mattijs Vanhaverbeke 2387e5d0cc removed distutils 2022-02-24 10:05:37 +01:00
Mattijs Vanhaverbeke 0bcbd35082 fixed old settings using a string instead of array 2022-02-24 09:59:04 +01:00
6 changed files with 5 additions and 15 deletions
+1 -1
View File
@@ -4,7 +4,7 @@ class TopologyViewsConfig(PluginConfig):
name = 'netbox_topology_views' name = 'netbox_topology_views'
verbose_name = 'Topology views' verbose_name = 'Topology views'
description = 'An plugin to render topology maps' description = 'An plugin to render topology maps'
version = '1.0.0-alpha.3' version = '1.0.0-alpha.5'
author = 'Mattijs Vanhaverbeke' author = 'Mattijs Vanhaverbeke'
author_email = 'author@example.com' author_email = 'author@example.com'
base_url = 'netbox_topology_views' base_url = 'netbox_topology_views'
-9
View File
@@ -12,15 +12,6 @@ from circuits.models import Circuit
from extras.models import Tag 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): class TopologyViewsRootView(APIRootView):
def get_view_name(self): def get_view_name(self):
return 'TopologyViews' return 'TopologyViews'
+1 -2
View File
@@ -10,7 +10,6 @@ from .forms import DeviceFilterForm
from .filters import DeviceFilterSet from .filters import DeviceFilterSet
import json import json
import distutils
from dcim.models import Device, Cable, DeviceRole, DeviceType from dcim.models import Device, Cable, DeviceRole, DeviceType
from extras.models import Tag from extras.models import Tag
@@ -182,7 +181,7 @@ class TopologyHomeView(PermissionRequiredMixin, View):
hide_unconnected = True hide_unconnected = True
if 'draw_init' in request.GET: 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) topo_data = get_topology_data(self.queryset, hide_unconnected)
else: else:
topo_data = get_topology_data(self.queryset, hide_unconnected) topo_data = get_topology_data(self.queryset, hide_unconnected)
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "netbox_topology_views", "name": "netbox_topology_views",
"version": "1.0.0-alpha.3", "version": "1.0.0-alpha.45",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
+1 -1
View File
@@ -1,7 +1,7 @@
{ {
"private": true, "private": true,
"name": "netbox_topology_views", "name": "netbox_topology_views",
"version": "1.0.0-alpha.3", "version": "1.0.0-alpha.45",
"scripts": { "scripts": {
"resources": "gulp build", "resources": "gulp build",
"resources_dev": "gulp build_dev" "resources_dev": "gulp build_dev"
+1 -1
View File
@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
setup( setup(
name='netbox-topology-views', name='netbox-topology-views',
version='1.0.0-alpha.3', version='1.0.0-alpha.5',
description='An NetBox plugin to create Topology maps', description='An NetBox plugin to create Topology maps',
url='https://github.com/mattieserver/netbox-topology-views', url='https://github.com/mattieserver/netbox-topology-views',
author='Mattijs Vanhaverbeke', author='Mattijs Vanhaverbeke',