mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make all image URLs absolute and fix path for viewer (#15788)

Browse Source
This commit is contained in:
eskyuu
2024-02-01 12:09:44 +08:00
committed by GitHub
parent 11246ca8e1
commit 81bf68ba88
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Maps/CustomMapController.php
View File

@@ -88,6 +88,7 @@ class CustomMapController extends Controller
'bgversion' => $map->background_version, 'bgversion' => $map->background_version,
'page_refresh' => Config::get('page_refresh', 300), 'page_refresh' => Config::get('page_refresh', 300),
'map_conf' => $map_conf, 'map_conf' => $map_conf,
'base_url' => Config::get('base_url'),
'newedge_conf' => $map->newedgeconfig, 'newedge_conf' => $map->newedgeconfig,
'newnode_conf' => $map->newnodeconfig, 'newnode_conf' => $map->newnodeconfig,
'vmargin' => 20, 'vmargin' => 20,
@@ -111,6 +112,7 @@ class CustomMapController extends Controller
'edit' => true, 'edit' => true,
'vmargin' => 20, 'vmargin' => 20,
'hmargin' => 20, 'hmargin' => 20,
'base_url' => Config::get('base_url'),
'images' => $this->listNodeImages(), 'images' => $this->listNodeImages(),
'maps' => CustomMap::orderBy('name')->where('custom_map_id', '<>', $map->custom_map_id)->get(['custom_map_id', 'name']), 'maps' => CustomMap::orderBy('name')->where('custom_map_id', '<>', $map->custom_map_id)->get(['custom_map_id', 'name']),
]; ];

2
resources/views/map/custom-edit.blade.php
View File

@@ -63,7 +63,7 @@
var network_nodes = new vis.DataSet({queue: {delay: 100}}); var network_nodes = new vis.DataSet({queue: {delay: 100}});
var network_edges = new vis.DataSet({queue: {delay: 100}}); var network_edges = new vis.DataSet({queue: {delay: 100}});
var node_device_map = {}; var node_device_map = {};
var custom_image_base = "images/custommap/icons/"; var custom_image_base = "{{ $base_url }}images/custommap/icons/";
function CreateNetwork() { function CreateNetwork() {
// Flush the nodes and edges so they are rendered immediately // Flush the nodes and edges so they are rendered immediately

2
resources/views/map/custom-view.blade.php
View File

@@ -33,7 +33,7 @@
var edge_port_map = {}; var edge_port_map = {};
var node_device_map = {}; var node_device_map = {};
var node_link_map = {}; var node_link_map = {};
var custom_image_base = "images/custommap/"; var custom_image_base = "{{ $base_url }}images/custommap/icons/";
function CreateNetwork() { function CreateNetwork() {
// Flush the nodes and edges so they are rendered immediately // Flush the nodes and edges so they are rendered immediately