MrBlake/mrb-netbox-topology-views
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes #547: XML Export does not work in modal window (#572)

Browse Source 
* Fix XML export in modal windows

* Removed useless concatenation

* Revert removed basePath in JS and added basePath to HTMX template
This commit is contained in:
Mario
2024-09-27 21:44:06 +02:00
committed by GitHub
parent 44e49495fe
commit 02a7118a33
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
netbox_topology_views/static/netbox_topology_views/js/app.js
+1 -1
View File
File diff suppressed because one or more lines are too long
netbox_topology_views/static_dev/js/home.js
+2 -2
View File
@@ -511,12 +511,12 @@ function performXmlDownload() {
if (curr_url.includes(sites_prefix)) { if (curr_url.includes(sites_prefix)) {
var site_id = curr_url.split(sites_prefix)[1]; var site_id = curr_url.split(sites_prefix)[1];
site_id = site_id.split('/')[0] site_id = site_id.split('/')[0]
xml_search_options = 'site_id=' + site_id + '&show_cables=on&show_unconnected=on' xml_search_options = 'site_id=' + site_id + '&show_cables=True&show_unconnected=True'
} }
else if (curr_url.includes(location_prefix)) { else if (curr_url.includes(location_prefix)) {
var location_id = curr_url.split(location_prefix)[1]; var location_id = curr_url.split(location_prefix)[1];
location_id = location_id.split('/')[0] location_id = location_id.split('/')[0]
xml_search_options = 'location_id=' + location_id + '&show_cables=on&show_unconnected=on' xml_search_options = 'location_id=' + location_id + '&show_cables=True&show_unconnected=True'
} }
} }
else { else {
netbox_topology_views/templates/netbox_topology_views/htmx_topology.html
+1
View File
@@ -40,5 +40,6 @@
var is_htmx = true; var is_htmx = true;
var brokenImage = '{{ broken_image }}'; var brokenImage = '{{ broken_image }}';
var topologyData = {{ topology_data | safe }}; var topologyData = {{ topology_data | safe }};
const basePath = '{{ basepath }}';
</script> </script>
<script src="{% static 'netbox_topology_views/js/app.js' %}?ver={{ epoch }} " defer></script> <script src="{% static 'netbox_topology_views/js/app.js' %}?ver={{ epoch }} " defer></script>