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

2009-10-06 Miguel de Dios <miguel.dedios@artica.es> 

* godmode/reporting/reporting_builder.php: fix in part the bug #2870769,
	exactly the second and third paragraph.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2009 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2009-10-06 19:58:39 +00:00
parent e1bce331bb
commit 7daa367a4b
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2009-10-06 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/reporting_builder.php: fix in part the bug #2870769,
exactly the second and third paragraph.
2009-10-06 Miguel de Dios <miguel.dedios@artica.es>
* operation/agentes/estado_generalagente.php,

20
pandora_console/godmode/reporting/reporting_builder.php
View File

@ -456,12 +456,22 @@ if ($edit_sla_report_content) {
}
$data[1] = get_report_name ($report_content['type']);
$data[2] = get_agent_name ($report_content['id_agent']);
$data[3] = '--';
if (get_report_type_data_source ($report_content['type']) == 'module') {
if ($report_content['id_agent_module'] > 0)
$data[2] = strtolower (get_agentmodule_agent_name ($report_content['id_agent_module']));
$data[3] = strtolower (get_db_value ('descripcion', 'tagente_modulo', 'id_agente_modulo', $report_content['id_agent_module']));
switch (get_report_type_data_source ($report_content['type'])) {
case 'module':
if ($report_content['id_agent_module'] > 0)
$data[2] = strtolower (get_agentmodule_agent_name ($report_content['id_agent_module']));
$data[3] = '<span title= "' . __(get_db_value ('descripcion', 'tagente_modulo', 'id_agente_modulo', $report_content['id_agent_module'])) .
'">' . strtolower (get_db_value ('nombre', 'tagente_modulo', 'id_agente_modulo', $report_content['id_agent_module'])) . "</span>";
break;
case 'custom-graph':
$data[3] = $report_content['description'];
break;
default:
$data[3] = '--';
break;
}
$data[4] = human_time_description ($report_content['period']);
$data[5] = '';
if ($report_content['type'] == 'SLA') {