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

Don't escape leaflet tile url in location edit map (#15695)

Browse Source 
* Don't escape leaflet tile url

* encode config as json and get config value in controller

* fixed array style
This commit is contained in:
Nicolas
2024-02-21 19:09:04 +01:00
committed by GitHub
parent 3d94c53438
commit b8095d6811
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/LocationController.php
View File

@@ -12,9 +12,11 @@ class LocationController extends Controller
public function index()
{
$maps_api = Config::get('geoloc.api_key');
$maps_config = ['tile_url' => Config::get('leaflet.tile_url', '{s}.tile.openstreetmap.org')];
$data = [
'maps_api' => $maps_api,
'maps_engine' => $maps_api ? Config::get('geoloc.engine') : '',
'maps_config' => $maps_config,
];
$data['graph_template'] = '';

2
resources/views/locations.blade.php
View File

@@ -148,7 +148,7 @@
locationId = $btn.data('id');
if (locationMap === null) {
config = {"tile_url": "{{ \LibreNMS\Config::get('leaflet.tile_url', '{s}.tile.openstreetmap.org') }}"};
config = {{ Js::from($maps_config) }}
locationMap = init_map('location-edit-map', '{{ $maps_engine }}', '{{ $maps_api }}', config);
locationMarker = init_map_marker(locationMap, location);
}