diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 37ec2dd973..f9a9b98bea 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2012-02-16 Juan Manuel Ramon + + * godmode/reporting/reporting_builder.php: Added calls to reporting + template functions. + 2012-02-16 Sergio Martin * operation/events/events.php: Fixed disable alerts in diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index 6114d86605..53f297fcd6 100644 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -42,8 +42,28 @@ $idItem = get_parameter('id_item', 0); switch ($action) { case 'delete_report': case 'list': + $buttons = array( + 'list_reports' => array('active' => false, + 'text' => '' . + html_print_image("images/god6.png", true, array ("title" => __('Main'))) .'') + ); + + if ($enterpriseEnable){ + $buttons = reporting_enterprise_add_main_Tabs($buttons); + } + + $subsection = ''; + switch ($activeTab){ + + case 'main': $buttons['list_reports']['active'] = true; + $subsection = ' » '.__('Custom reporting'); + break; + default: $subsection = reporting_enterprise_add_subsection_main($activeTab, &$buttons); + break; + } + // Report LIST - ui_print_page_header (__('Reporting').' » '.__('Custom reporting'), "images/reporting_edit.png", false, "", true); + ui_print_page_header (__('Reporting') . $subsection, "images/reporting_edit.png", false, "", true, $buttons); if ($action == 'delete_report') { $result = reports_delete_report ($idReport); @@ -618,6 +638,35 @@ switch ($action) { break; } break; + // Added for report templates + default: + if ($enterpriseEnable){ + $buttons = array( + 'list_reports' => array('active' => false, + 'text' => '' . + html_print_image("images/god6.png", true, array ("title" => __('Main'))) .'') + ); + + $buttons = reporting_enterprise_add_main_Tabs($buttons); + + $subsection = ''; + switch ($activeTab){ + + case 'main': $buttons['list_reports']['active'] = true; + $subsection = ' » '.__('Custom reporting'); + break; + default: $subsection = reporting_enterprise_add_subsection_main($activeTab, &$buttons); + break; + } + + // Report LIST + ui_print_page_header (__('Reporting') . $subsection, "images/reporting_edit.png", false, "", true, $buttons); + + reporting_enterprise_select_main_tab($action); + } + + return; + break; } if ($enterpriseEnable) {