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

#13059 fix bugs chose modules, chose agents, css, save and print data

This commit is contained in:
Jonathan 2024-04-08 14:05:05 +02:00
parent 5824d52ff3
commit 0838afe8b1
4 changed files with 42 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pandora_console/include/functions_html.php
View File

@ -16,7 +16,7 @@
* @package Include
* @subpackage HTML
*/
use PandoraFMS\Enterprise\Metaconsole\Node;
if (!isset($config)) {
$working_dir = getcwd();
$working_dir = str_replace('\\', '/', $working_dir);
@ -2078,7 +2078,7 @@ function html_print_select_multiple_modules_filtered_formated(array $data):strin
explode(',', $data['mAgents']),
!$commonModules,
!is_metaconsole(),
(bool) $commonModules,
is_metaconsole(),
false
);
} else {
@ -2091,6 +2091,31 @@ function html_print_select_multiple_modules_filtered_formated(array $data):strin
',',
$data['mModules']
);
} else {
if (is_metaconsole()) {
foreach ($data['mModules'] as $row) {
$exp = explode('|', $row);
if (empty($exp[0]) === false) {
if (is_numeric($exp[1]) === false) {
if (is_metaconsole() === true) {
$node = new Node($exp[0]);
$node->connect();
}
$module = explode(' » ', $exp[1]);
$id_agente = db_get_sql(sprintf('SELECT id_agente FROM tagente WHERE nombre = "%s"', $module[1]));
$id_agente_modulo = db_get_sql(sprintf('SELECT id_agente_modulo FROM tagente_modulo WHERE nombre = "%s" AND id_agente = %s', $module[2], $id_agente));
$array = [
$exp[0].'|'.$id_agente_modulo => $exp[0].'|'.$id_agente_modulo,
];
$mModules = array_merge($mModules, $array);
if (is_metaconsole() === true) {
$node->disconnect();
}
}
}
}
}
}
$result = [];

4
pandora_console/include/javascript/pandora_dashboards.js
View File

@ -281,6 +281,8 @@ function initialiceLayout(data) {
});
$("#configure-widget-" + id).click(function() {
widgetId =
widgetId === 0 ? $("#hidden-widget_id_" + id).val() : widgetId;
getSizeModalConfiguration(id, widgetId);
});
@ -815,6 +817,8 @@ function initialiceLayout(data) {
});
$("#configure-widget-" + cellId).click(function() {
widgetId =
widgetId === 0 ? $("#hidden-widget_id_" + cellId).val() : widgetId;
getSizeModalConfiguration(cellId, widgetId);
});

19
pandora_console/include/lib/Dashboard/Widgets/agent_module.php
View File

@ -179,7 +179,7 @@ class AgentModuleWidget extends Widget
// This forces at least a first configuration.
$this->configurationRequired = false;
if (isset($this->values['mModules']) === false) {
if (isset($this->values['mModules']) === false || (isset($this->values['mModules']) === true && empty($this->values['mModules'][0]) === true)) {
$this->configurationRequired = true;
}
@ -825,14 +825,15 @@ class AgentModuleWidget extends Widget
}
$key_name_module = $module->name();
if ($this->values['mTypeShow'] === '1') {
$mod = $module->toArray();
$mod['datos'] = $module->lastValue();
$module_last_value = modules_get_agentmodule_data_for_humans($mod);
$visualData[$agent_id]['modules'][$key_name_module] = $module_last_value;
} else {
$visualData[$agent_id]['modules'][$key_name_module] = $module->getStatus()->estado();
if (array_key_exists($key_name_module, $allModules) === true) {
if ($this->values['mTypeShow'] === '1') {
$mod = $module->toArray();
$mod['datos'] = $module->lastValue();
$module_last_value = modules_get_agentmodule_data_for_humans($mod);
$visualData[$agent_id]['modules'][$key_name_module] = $module_last_value;
} else {
$visualData[$agent_id]['modules'][$key_name_module] = $module->getStatus()->estado();
}
}
}

1
pandora_console/views/dashboard/cell.php
View File

@ -71,6 +71,7 @@ if ($manageDashboards !== 0 || $writeDashboards !== 0) {
$output .= '<a id="configure-widget-'.$cellData['id'].'" class="">';
$widget_description = db_get_value_sql('SELECT description FROM twidget WHERE id ='.$cellData['id_widget']);
$output .= html_print_input_hidden('widget_name_'.$cellData['id'], $widget_description, true);
$output .= html_print_input_hidden('widget_id_'.$cellData['id'], $cellData['id_widget'], true);
$output .= html_print_image(
'images/configuration@svg.svg',
true,