tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

#11495 Fix agent name in metaconsole module selector

Browse Source
This commit is contained in:
miguel angel rasteu 2023-12-11 16:46:19 +01:00
parent 3a00ba0fd6
commit 94256559f1
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -2335,7 +2335,7 @@ if (is_metaconsole() === true) {
$modulegroup, $modulegroup,
$id_agents, $id_agents,
!$selection_a_m, !$selection_a_m,
false true
); );
} }

4
pandora_console/include/functions_agents.php
View File

@ -3664,7 +3664,7 @@ function select_modules_for_agent_group(
$sql = "SELECT * FROM $sql = "SELECT * FROM
( (
SELECT DISTINCT(tagente_modulo.id_agente_modulo), tagente_modulo.nombre SELECT (tagente_modulo.id_agente_modulo), tagente_modulo.nombre, tagente.alias
FROM tagente_modulo FROM tagente_modulo
$sql_tags_inner $sql_tags_inner
INNER JOIN tagente INNER JOIN tagente
@ -3679,7 +3679,7 @@ function select_modules_for_agent_group(
$filter_not_string_modules $filter_not_string_modules
$sql_conditions_tags $sql_conditions_tags
) x ) x
GROUP BY nombre
$selection_filter"; $selection_filter";
$modules = db_get_all_rows_sql($sql); $modules = db_get_all_rows_sql($sql);

12
pandora_console/include/functions_modules.php
View File

@ -3774,9 +3774,15 @@ function get_modules_agents(
$t['id_node'] = $tserver; $t['id_node'] = $tserver;
if ($nodes[$tserver] !== null) { if ($nodes[$tserver] !== null) {
$t['nombre'] = io_safe_output( if (isset($t['alias']) === true) {
$nodes[$tserver]->server_name().' » '.$t['nombre'] $t['nombre'] = io_safe_output(
); $nodes[$tserver]->server_name().' » '.$t['alias'].' » '.$t['nombre']
);
} else {
$t['nombre'] = io_safe_output(
$nodes[$tserver]->server_name().' » '.$t['nombre']
);
}
} }
$carry[] = $t; $carry[] = $t;