mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-30 17:25:26 +02:00
#12207 Fix status
This commit is contained in:
parent
35cd554257
commit
de2221d9b7
@ -769,7 +769,6 @@ class DiscoveryTaskList extends HTML
|
|||||||
$_rs = $this->getStatusMessage($task);
|
$_rs = $this->getStatusMessage($task);
|
||||||
$can_be_reviewed = $_rs['can_be_reviewed'];
|
$can_be_reviewed = $_rs['can_be_reviewed'];
|
||||||
$data[5] = $_rs['message'];
|
$data[5] = $_rs['message'];
|
||||||
;
|
|
||||||
|
|
||||||
switch ($task['type']) {
|
switch ($task['type']) {
|
||||||
case DISCOVERY_CLOUD_AZURE_COMPUTE:
|
case DISCOVERY_CLOUD_AZURE_COMPUTE:
|
||||||
@ -1973,7 +1972,6 @@ class DiscoveryTaskList extends HTML
|
|||||||
{
|
{
|
||||||
$status = '';
|
$status = '';
|
||||||
$can_be_reviewed = false;
|
$can_be_reviewed = false;
|
||||||
|
|
||||||
if (empty($task['summary']) === false
|
if (empty($task['summary']) === false
|
||||||
&& $task['summary'] == 'cancelled'
|
&& $task['summary'] == 'cancelled'
|
||||||
) {
|
) {
|
||||||
@ -1988,12 +1986,16 @@ class DiscoveryTaskList extends HTML
|
|||||||
if ($task['status'] == -2) {
|
if ($task['status'] == -2) {
|
||||||
$status = __('Failed');
|
$status = __('Failed');
|
||||||
} else {
|
} else {
|
||||||
$status = __('Pending');
|
$status = __('Done');
|
||||||
}
|
}
|
||||||
} else if ($task['utimestamp'] == 0
|
} else if ($task['utimestamp'] == 0
|
||||||
&& empty($task['summary'])
|
&& (bool) empty($task['summary']) === true
|
||||||
) {
|
) {
|
||||||
$status = __('Not started');
|
$status = __('Not started');
|
||||||
|
} else if ($task['utimestamp'] > 0
|
||||||
|
&& (bool) empty($task['summary']) === true
|
||||||
|
) {
|
||||||
|
$status = __('Pending');
|
||||||
} else if ($task['utimestamp'] > 0) {
|
} else if ($task['utimestamp'] > 0) {
|
||||||
$status = __('Done');
|
$status = __('Done');
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user