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

Fix Network Map Device Group Highlighting (#12290)

Browse Source 
* Fix Network Map Device Group Highlighting

* style fix

* change parameter fallback

* change if clause
This commit is contained in:
SourceDoctor
2020-11-09 14:48:03 +01:00
committed by GitHub
parent 8f3b08721a
commit be3853f885
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
includes/html/print-map.inc.php
View File

@@ -14,7 +14,8 @@
use LibreNMS\Config;
$highlight_node = $vars['highlight_node'] | 0;
$highlight_node = $vars['highlight_node'] ?? 0;
$group = $vars['group'] ?? 0;
//Don't know where this should come from, but it is used later, so I just define it here.
$row_colour = '#ffffff';
@@ -44,11 +45,11 @@ $ports = [];
$devices = [];
$where = '';
if (is_numeric($vars['group'])) {
if (is_numeric($group) && $group) {
$where .= ' AND D1.device_id IN (SELECT `device_id` FROM `device_group_device` WHERE `device_group_id` = ?)';
$sql_array[] = $vars['group'];
$sql_array[] = $group;
$where .= ' OR D2.device_id IN (SELECT `device_id` FROM `device_group_device` WHERE `device_group_id` = ?)';
$sql_array[] = $vars['group'];
$sql_array[] = $group;
}
if (in_array('mac', Config::get('network_map_items'))) {
@@ -385,7 +386,12 @@ var network = new vis.Network(container, data, options);
function highlightNode(e) {
highlight_node = document.getElementById("highlight_node").value;
window.location.pathname = 'map/highlight_node=' + highlight_node;
<?php
if ($group) {
echo "window.location.pathname = 'map/group=" . $group . "/highlight_node=' + highlight_node;";
} else {
echo "window.location.pathname = 'map/highlight_node=' + highlight_node;";
} ?>
}
$('#highlight_node option[value="<?=$highlight_node?>"]').prop('selected', true);