diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php index 1dfc7063e7..a37a04d6d5 100644 --- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php +++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php @@ -409,7 +409,7 @@ class DiscoveryTaskList extends HTML // Status. $table->headstyle[5] .= 'min-width: 50px; width: 100px;'; // Task type. - $table->headstyle[6] .= 'min-width: 150px; width: 150px;'; + $table->headstyle[6] .= 'min-width: 200px; width: 200px;'; // Progress. $table->headstyle[7] .= 'min-width: 50px; width: 150px;'; // Updated at. @@ -552,16 +552,26 @@ class DiscoveryTaskList extends HTML true ); } else if ($task['review_mode'] == DISCOVERY_STANDARD) { - if ($task['status'] <= 0 - && empty($task['summary']) === false - ) { - $data[5] = __('Done'); - } else if ($task['utimestamp'] == 0 - && empty($task['summary']) - ) { - $data[5] = __('Not started'); + if ($task['type'] == DISCOVERY_APP_VMWARE) { + if ($task['status'] <= 0 && $task['utimestamp'] != 0) { + $data[5] = __('Done'); + } else if ($task['status'] > 0) { + $data[5] = __('Pending'); + } else { + $data[5] = __('Not started'); + } } else { - $data[5] = __('Pending'); + if ($task['status'] <= 0 + && empty($task['summary']) === false + ) { + $data[5] = __('Done'); + } else if ($task['utimestamp'] == 0 + && empty($task['summary']) + ) { + $data[5] = __('Not started'); + } else { + $data[5] = __('Pending'); + } } } else { if ($task['status'] <= 0 @@ -1207,12 +1217,15 @@ class DiscoveryTaskList extends HTML $output = ''; // Header information. - if ((int) $task['status'] <= 0 - && empty($summary) - && $task['id_recon_script'] == 0 - ) { + if ((int) $task['status'] <= 0 && empty($summary)) { + if ($task['type'] == DISCOVERY_APP_VMWARE && $task['utimestamp'] != 0) { + $outputMessage = __('Task completed.'); + } else { + $outputMessage = __('This task has never executed'); + } + $output .= ui_print_info_message( - __('This task has never executed'), + $outputMessage, '', true ); diff --git a/pandora_console/include/javascript/pandora_ui.js b/pandora_console/include/javascript/pandora_ui.js index 392635d370..2e2e29397a 100644 --- a/pandora_console/include/javascript/pandora_ui.js +++ b/pandora_console/include/javascript/pandora_ui.js @@ -187,8 +187,7 @@ function load_modal(settings) { var formdata = new FormData(); if (settings.extradata) { settings.extradata.forEach(function(item) { - if (item.value != undefined) - formdata.append(item.name, item.value); + if (item.value != undefined) formdata.append(item.name, item.value); }); } formdata.append("page", settings.onsubmit.page); @@ -215,7 +214,7 @@ function load_modal(settings) { } }); $(this).tooltip("open"); - + var element = $(this); setTimeout( function(element) { @@ -282,8 +281,8 @@ function load_modal(settings) { data: formdata, dataType: settings.onsubmit.dataType, success: function(data) { - console.log("successsssssssssssss"); - console.log(data); + console.log("successsssssssssssss"); + console.log(data); if (settings.ajax_callback != undefined) { if (settings.idMsgCallback != undefined) { settings.ajax_callback(data, settings.idMsgCallback); @@ -304,17 +303,20 @@ function load_modal(settings) { document.getElementById(settings.form).submit(); } } - } + }; required_buttons.push({ class: "ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-next", text: settings.modal.ok, click: function() { - if (settings.onsubmit != undefined && settings.onsubmit.onConfirmSubmit != undefined) { - settings.onsubmit.onConfirmSubmit(btnClickHandler, $(this)); + if ( + settings.onsubmit != undefined && + settings.onsubmit.onConfirmSubmit != undefined + ) { + settings.onsubmit.onConfirmSubmit(btnClickHandler, $(this)); } else { - btnClickHandler($(this)); + btnClickHandler($(this)); } }, error: function(data) {