Merge branch 'ent-11805-error-en-custom-reports-report-tasks-1-sin-reports' into 'develop'
Ent 11805 error en custom reports report tasks 1 sin reports See merge request artica/pandorafms!6310
This commit is contained in:
commit
e28c7db126
|
@ -1280,8 +1280,7 @@ switch ($action) {
|
||||||
|
|
||||||
$discovery_tasklist = new DiscoveryTaskList();
|
$discovery_tasklist = new DiscoveryTaskList();
|
||||||
$report_task_data = $discovery_tasklist->showListConsoleTask(true);
|
$report_task_data = $discovery_tasklist->showListConsoleTask(true);
|
||||||
|
if (is_array($report_task_data) === true || (strpos($report_task_data, 'class="nf"') === false && $report_task_data !== -1)) {
|
||||||
if (is_array($report_task_data) === true || strpos($report_task_data, 'class="nf"') === false) {
|
|
||||||
$task_table = '<div class="mrgn_top_15px white_box">';
|
$task_table = '<div class="mrgn_top_15px white_box">';
|
||||||
$task_table .= '<span class="white_table_graph_header">'.__('Report tasks');
|
$task_table .= '<span class="white_table_graph_header">'.__('Report tasks');
|
||||||
$task_table .= ui_print_help_tip(__('To schedule a report, do it from the editing view of each report.'), true);
|
$task_table .= ui_print_help_tip(__('To schedule a report, do it from the editing view of each report.'), true);
|
||||||
|
@ -1290,6 +1289,10 @@ switch ($action) {
|
||||||
$task_table .= '</div></div>';
|
$task_table .= '</div></div>';
|
||||||
echo $task_table;
|
echo $task_table;
|
||||||
} else {
|
} else {
|
||||||
|
if ($report_task_data === -1) {
|
||||||
|
$report_task_data = '';
|
||||||
|
}
|
||||||
|
|
||||||
ui_print_info_message($report_task_data.__('To schedule a report, do it from the editing view of each report.'));
|
ui_print_info_message($report_task_data.__('To schedule a report, do it from the editing view of each report.'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue