From 3b19d34bdc5f496ef0165317981e4e6798e06a2d Mon Sep 17 00:00:00 2001 From: fermin831 Date: Mon, 26 Feb 2018 10:12:29 +0100 Subject: [PATCH] pandora_console/godmode/reporting/create_container.php --- pandora_console/godmode/reporting/graphs.php | 4 ++++ pandora_console/godmode/reporting/reporting_builder.php | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pandora_console/godmode/reporting/graphs.php b/pandora_console/godmode/reporting/graphs.php index f235037070..f6afa3c423 100644 --- a/pandora_console/godmode/reporting/graphs.php +++ b/pandora_console/godmode/reporting/graphs.php @@ -161,7 +161,9 @@ if (!empty ($graphs)) { $table->size[3] = '200px'; $table->align[2] = 'left'; $table->align[3] = 'left'; + $op_column = false; if ($report_w || $report_m) { + $op_column = true; $table->align[4] = 'left'; $table->head[4] = __('Op.') . html_print_checkbox('all_delete', 0, false, true, false, @@ -193,6 +195,8 @@ if (!empty ($graphs)) { .$graph['id_graph'].'" onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">' . html_print_image("images/cross.png", true, array('alt' => __('Delete'), 'title' => __('Delete'))) . '' . html_print_checkbox_extended ('delete_multiple[]', $graph['id_graph'], false, false, '', 'class="check_delete" style="margin-left:2px;"', true); + } else { + if($op_column) $data[4] = ''; } array_push ($table->data, $data); diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index ced230cf3c..4d4c1c6ab2 100755 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -596,10 +596,13 @@ switch ($action) { $table->size[$next] = '15%'; $next++; - if(!defined('METACONSOLE')) + $op_column = false; + if(!defined('METACONSOLE')) { + $op_column = true; $table->head[$next] = '' . __('Op.') . ''.html_print_checkbox('all_delete', 0, false, true, false, 'check_all_checkboxes();'); + } //$table->size = array (); $table->size[$next] = '10%'; @@ -746,6 +749,8 @@ switch ($action) { $data[$next] .= ''; } + } else { + if ($op_column) $data[$next] = ''; } array_push ($table->data, $data);