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-6920-no-se-visualiza-dato-de-modulo-tipo-string-en-consola-movil-con-command-line-snapshot-activado' into 'develop' 

Ent 6920 no se visualiza dato de modulo tipo string en consola movil con command line snapshot activado

See merge request artica/pandorafms!3767
This commit is contained in:
Daniel Rodriguez 2021-01-25 09:54:06 +01:00
parent 7a9d928a98 efcd123a65
commit 5d137594a4
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitignore vendored
View File

@ -1 +1,11 @@
pandora_console/attachment/agents
.vstags
MYMETA.json
MYMETA.yml
.vscode
.vscode*
.vstags
**/blib
**/PandoraFMS-Enterprise/Makefile
**/PandoraFMS-Enterprise/pm_to_blib
**/pandora_console/attachment/cache
**/pandora_console/attachment/agents

16
pandora_console/mobile/operation/modules.php
View File

@ -684,7 +684,8 @@ class Modules
]
);
$row[7] = ui_get_snapshot_image($link, $is_snapshot).'  ';
// Row 7.
$row[__('Data')] = ui_get_snapshot_image($link, $is_snapshot).'  ';
} else {
if ($system->getConfig('metaconsole')) {
$row[__('Data')] = '<span style="white-space: nowrap;">';
@ -695,9 +696,18 @@ class Modules
$row[__('Data')] .= '&server_id='.$module['server_id'];
$row[__('Data')] .= '&id_agent='.$this->id_agent.'">';
$row[__('Data')] .= $output.'</a></span>';
$row[7] = $row[__('Data')];
// Row 7.
$row[__('Data')];
} else {
$row[7] = $row[__('Data')] = '<span style="white-space: nowrap;">'.'<span style="display: none;" class="show_collapside">'.$row[__('Status')].'&nbsp;&nbsp;</span>'.'<a data-ajax="false" class="ui-link" '.'href="index.php?page=module_graph&id='.$module['id_agente_modulo'].'&id_agent='.$this->id_agent.'">'.$output.'</a>'.'</span>';
// Row 7.
$row[__('Data')] = '<span style="white-space: nowrap;">';
$row[__('Data')] .= '<span style="display: none;" class="show_collapside">';
$row[__('Data')] .= $row[__('Status')].'&nbsp;&nbsp;</span>';
$row[__('Data')] .= '<a data-ajax="false" class="ui-link" ';
$row[__('Data')] .= 'href="index.php?page=module_graph&id=';
$row[__('Data')] .= $module['id_agente_modulo'];
$row[__('Data')] .= '&id_agent='.$this->id_agent.'">';
$row[__('Data')] .= $output.'</a></span>';
}
}