tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed minor error tasklist

Browse Source 
Former-commit-id: 1ee10794b09e17c3b8403dfe5540195047595577
This commit is contained in:
Daniel Barbero Martin 2019-03-26 17:22:14 +01:00
parent 511295f1c6
commit db39c3921b
2 changed files with 97 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/include/ajax/task_list.ajax.php
View File

@ -44,6 +44,7 @@ if ($progress_task_discovery) {
$summary = json_decode($task['summary'], true); $summary = json_decode($task['summary'], true);
$result = '<div id = progress_task_'.$id_task.'>'; $result = '<div id = progress_task_'.$id_task.'>';
if ($task['utimestamp']) {
$result .= '<ul class="progress_task_discovery">'; $result .= '<ul class="progress_task_discovery">';
$result .= '<li><h1>'._('Overall Progress').'</h1></li>'; $result .= '<li><h1>'._('Overall Progress').'</h1></li>';
$result .= '<li>'; $result .= '<li>';
@ -142,6 +143,14 @@ if ($progress_task_discovery) {
$table->data[$i++][1] .= '</span>'; $table->data[$i++][1] .= '</span>';
$result .= html_print_table($table, true).'</div>'; $result .= html_print_table($table, true).'</div>';
} else {
$global_progress = -1;
$result .= ui_print_error_message(
__('No data to show'),
'',
true
).'</div>';
}
$result_array['status'] = $global_progress; $result_array['status'] = $global_progress;
$result_array['html'] = $result; $result_array['html'] = $result;

2
pandora_console/include/javascript/pandora_taskList.js
View File

@ -35,10 +35,8 @@ function progress_task_list(id, title) {
// TODO: Show info about the problem. // TODO: Show info about the problem.
} }
if (data.status > 0) {
$elem.html(data.html); $elem.html(data.html);
if (!$elem.dialog("isOpen")) $elem.dialog("open"); if (!$elem.dialog("isOpen")) $elem.dialog("open");
}
if (data.status != -1) { if (data.status != -1) {
timeoutRef = setTimeout(function() { timeoutRef = setTimeout(function() {