Merge branch 'pandora_5.1' of https://github.com/pandorafms/pandorafms into pandora_5.1

This commit is contained in:
Alejandro Gallardo Escobar 2015-02-26 19:47:39 +01:00
commit 2ff3782262

View File

@ -5343,7 +5343,9 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
$table1->head = array (); $table1->head = array ();
$table1->head[0] = __('Agent'); $table1->head[0] = __('Agent');
$table1->head[1] = __('Module'); $table1->head[1] = __('Module');
if ($content['period'] != 0) {
$table1->head[2] = __('Operation'); $table1->head[2] = __('Operation');
}
$table1->head[3] = __('Value'); $table1->head[3] = __('Value');
$table1->style[0] = 'text-align: left'; $table1->style[0] = 'text-align: left';
$table1->style[1] = 'text-align: left'; $table1->style[1] = 'text-align: left';
@ -5440,6 +5442,7 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
$data[0] = $agent_name[$i]; $data[0] = $agent_name[$i];
$data[1] = $module_name[$i]; $data[1] = $module_name[$i];
if ($content['period'] != 0) {
switch ($operations[$i]) { switch ($operations[$i]) {
case 'sum': case 'sum':
$op = __('Summatory'); $op = __('Summatory');
@ -5456,6 +5459,7 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
break; break;
} }
$data[2] = $op; $data[2] = $op;
}
if ($d === false) { if ($d === false) {
$data[3] = '--'; $data[3] = '--';