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

Merge branch 'develop' into develop-2.4

Browse Source
This commit is contained in:
Jeremy Stretch
2018-07-02 17:01:14 -04:00
parent 104bd1b45f b10635a9b1
commit d0308e0f58
23 changed files with 112 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,7 +102,7 @@ class TopologyMapViewSet(ModelViewSet):
try:
data = tmap.render(img_format=img_format)
except:
except Exception:
return HttpResponse(
"There was an error generating the requested graph. Ensure that the GraphViz executables have been "
"installed correctly."