tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-11487-sunburst-no-muestra-elementos-en-su-interior' into 'develop' 

Ent 11487 sunburst no muestra elementos en su interior

See merge request
This commit is contained in:
Rafael Ameijeiras 2023-07-18 12:35:01 +00:00
parent 3482ef7d8e 5806da78dd
commit 7a9629a4e5
2 changed files with 18 additions and 13 deletions
pandora_console
include
functions_graph.php
operation/agentes
pandora_networkmap.editor.php

23
pandora_console/include/functions_graph.php
View File

@ -4983,19 +4983,18 @@ function graph_monitor_wheel($width=550, $height=600, $filter=false)
$filter_module_group = (!empty($filter) && !empty($filter['module_group'])) ? $filter['module_group'] : false; $filter_module_group = (!empty($filter) && !empty($filter['module_group'])) ? $filter['module_group'] : false;
if ($filter['group'] != 0) { if ($filter['group'] != 0) {
$filter_subgroups = ''; if ($filter['dont_show_subgroups'] === false) {
if (!$filter['dont_show_subgroups']) { $groups = groups_get_children($filter['group']);
$filter_subgroups = ' || parent IN ('.$filter['group'].')'; $groups_ax = [];
foreach ($groups as $g) {
$groups_ax[$g['id_grupo']] = $g;
}
$groups = $groups_ax;
} else {
$groups = groups_get_group_by_id($filter['group']);
$groups[$group['id_grupo']] = $group;
} }
$groups = db_get_all_rows_sql('SELECT * FROM tgrupo where id_grupo IN ('.$filter['group'].') '.$filter_subgroups);
$groups_ax = [];
foreach ($groups as $g) {
$groups_ax[$g['id_grupo']] = $g;
}
$groups = $groups_ax;
} else { } else {
$groups = users_get_groups(false, 'AR', false, true, (!empty($filter) && isset($filter['group']) ? $filter['group'] : null)); $groups = users_get_groups(false, 'AR', false, true, (!empty($filter) && isset($filter['group']) ? $filter['group'] : null));
} }

8
pandora_console/operation/agentes/pandora_networkmap.editor.php
View File

@ -205,9 +205,15 @@ if ($edit_networkmap) {
$button = []; $button = [];
if ($edit_networkmap === true) { if ($edit_networkmap === true) {
if (empty($method) === false && $method === 'radial_dinamic') {
$url = 'index.php?sec=network&sec2=operation/agentes/networkmap.dinamic&activeTab=radial_dynamic&id_networkmap='.$id;
} else {
$url = 'index.php?sec=network&sec2=operation/agentes/pandora_networkmap&tab=view&id_networkmap='.$id;
}
$button['map'] = [ $button['map'] = [
'active' => false, 'active' => false,
'text' => '<a href="index.php?sec=network&sec2=operation/agentes/pandora_networkmap&tab=view&id_networkmap='.$id.'">'.html_print_image( 'text' => '<a href="'.$url.'">'.html_print_image(
'images/network@svg.svg', 'images/network@svg.svg',
true, true,
[ [