From 08cc67696a4b1697afd864b63492117acdef68cf Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Fri, 13 Nov 2020 11:36:06 +0100 Subject: [PATCH] WIP: Backup upload --- .../wizards/DiscoveryTaskList.class.php | 36 +++++++++++++------ 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php index 59a9fab84a..f664b761c1 100644 --- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php +++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php @@ -546,16 +546,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) { + $data[5] == __('Done'); + } else if ($task['status'] > 0 && $task['utimestamp'] == 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 @@ -1201,8 +1211,14 @@ class DiscoveryTaskList extends HTML // Header information. if ((int) $task['status'] <= 0 && empty($summary)) { + if ($task['type'] == DISCOVERY_APP_VMWARE) { + $outputMessage = __('Task completed.'); + } else { + $outputMessage = __('This task has never executed'); + } + $output .= ui_print_info_message( - __('This task has never executed'), + $outputMessage, '', true );