Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'bugfix/liwenrui/zentaobottasks' into 'master'

Browse Source 
* fix bot error handling.

See merge request easycorp/zentaopms!6574
This commit is contained in:
孙广明
2022-12-16 05:11:23 +00:00
parent 6036606f6e 7d8e0d43ac
commit 9d4bd9d8e1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xuanxuan/extension/xuan/im/ext/bot/zentao.bot.php
+3 -3
View File
@@ -408,7 +408,7 @@ class zentaoBot extends xuanBot
if($task->status != 'done' && $task->status != 'cancel') return sprintf($this->lang->errors->invalidStatus, $this->taskStatusList[$task->status]);
$task = $this->loadEntry('taskclose', 'post', array('taskID' => $taskID, 'comment' => $comment));
if($task->result == 'fail') return $task->message;
if(isset($task->result) && $task->result == 'fail') return $task->message;
$link = str_replace('x.php', 'index.php', helper::createLink('task', 'view', "taskID=$taskID", 'html'));
$messages = new stdClass();
@@ -687,7 +687,7 @@ class zentaoBot extends xuanBot
}
else
{
$tr .= "<td class='text-nowrap'>{$task->assignedTo->realname}</td>";
$tr .= "<td class='text-nowrap'>" . (empty($task->assignedTo) ? $lang->task->noAssigned : (is_object($task->assignedTo) ? $task->assignedTo->realname : $task->assignedTo)) . "</td>";
}
break;
case 'actions':
@@ -861,7 +861,7 @@ class zentaoBot extends xuanBot
'realStarted' => $realStarted,
'consumed' => $consumed,
));
if($task->result and $task->result == 'fail')
if(isset($task->result) and $task->result == 'fail')
{
$reply->messages[] = $task->message;
}