mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-28 08:14:38 +02:00
2012-02-16 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/reporting/reporting_builder.php: Added calls to reporting template functions. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5617 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
parent
2ad4e2bd33
commit
bb7beccd08
@ -1,3 +1,8 @@
|
|||||||
|
2012-02-16 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
|
||||||
|
|
||||||
|
* godmode/reporting/reporting_builder.php: Added calls to reporting
|
||||||
|
template functions.
|
||||||
|
|
||||||
2012-02-16 Sergio Martin <sergio.martin@artica.es>
|
2012-02-16 Sergio Martin <sergio.martin@artica.es>
|
||||||
|
|
||||||
* operation/events/events.php: Fixed disable alerts in
|
* operation/events/events.php: Fixed disable alerts in
|
||||||
|
@ -42,8 +42,28 @@ $idItem = get_parameter('id_item', 0);
|
|||||||
switch ($action) {
|
switch ($action) {
|
||||||
case 'delete_report':
|
case 'delete_report':
|
||||||
case 'list':
|
case 'list':
|
||||||
|
$buttons = array(
|
||||||
|
'list_reports' => array('active' => false,
|
||||||
|
'text' => '<a href="index.php?sec=greporting&sec2=godmode/reporting/reporting_builder">' .
|
||||||
|
html_print_image("images/god6.png", true, array ("title" => __('Main'))) .'</a>')
|
||||||
|
);
|
||||||
|
|
||||||
|
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
|
// 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') {
|
if ($action == 'delete_report') {
|
||||||
$result = reports_delete_report ($idReport);
|
$result = reports_delete_report ($idReport);
|
||||||
@ -618,6 +638,35 @@ switch ($action) {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
// Added for report templates
|
||||||
|
default:
|
||||||
|
if ($enterpriseEnable){
|
||||||
|
$buttons = array(
|
||||||
|
'list_reports' => array('active' => false,
|
||||||
|
'text' => '<a href="index.php?sec=greporting&sec2=godmode/reporting/reporting_builder">' .
|
||||||
|
html_print_image("images/god6.png", true, array ("title" => __('Main'))) .'</a>')
|
||||||
|
);
|
||||||
|
|
||||||
|
$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) {
|
if ($enterpriseEnable) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user