diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 999df41f6f..63657726eb 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2013-07-26 Sergio Martin + + * godmode/reporting/reporting_builder.php: Fix errors + on reports edition + 2013-07-26 Sergio Martin * include/functions_filemanager.php: Fixed file manager diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index 8c52c261ff..11e0a2b823 100644 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -530,7 +530,6 @@ switch ($action) { $private = 1; break; } - if ($action == 'update') { if ($reportName != "" && $idGroupReport != "") { $new_values = array('name' => $reportName, @@ -544,14 +543,14 @@ switch ($action) { array('id_report' => $idReport)); $report_id_user = $report['id_user']; if ($report_id_user != $config['id_user'] && - is_user_admin ($config["id_user"])) { + !is_user_admin ($config["id_user"])) { unset($new_values['private']); unset($new_values['id_group_edit']); } - $resultOperationDB = (bool)db_process_sql_update( 'treport', $new_values, array('id_report' => $idReport)); + if ($resultOperationDB !== false) db_pandora_audit( "Report management", "Update report #$idReport"); @@ -1352,7 +1351,7 @@ switch ($action) { $buttons = array( 'list_reports' => array('active' => false, 'text' => '' . - html_print_image("images/op_reporting.png", true, array ("title" => __('Reports list'))) .'') + html_print_image("images/report_list.png", true, array ("title" => __('Reports list'))) .'') ); $buttons = reporting_enterprise_add_main_Tabs($buttons); @@ -1401,7 +1400,14 @@ if ($enterpriseEnable) { } } + $buttons = array( + + ); + $buttons = array( + 'list_reports' => array('active' => false, + 'text' => '' . + html_print_image("images/report_list.png", true, array ("title" => __('Reports list'))) .''), 'main' => array('active' => false, 'text' => '' . html_print_image("images/op_reporting.png", true, array ("title" => __('Main data'))) .''),