From 8d6014d0be924fc10d23842bfc8dd489cf526d64 Mon Sep 17 00:00:00 2001 From: Wenrui LI Date: Fri, 16 Dec 2022 09:57:52 +0800 Subject: [PATCH 1/2] * fix bot error handling. --- xuanxuan/extension/xuan/im/ext/bot/zentao.bot.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xuanxuan/extension/xuan/im/ext/bot/zentao.bot.php b/xuanxuan/extension/xuan/im/ext/bot/zentao.bot.php index 82b6f7af82..ff44b2c78b 100644 --- a/xuanxuan/extension/xuan/im/ext/bot/zentao.bot.php +++ b/xuanxuan/extension/xuan/im/ext/bot/zentao.bot.php @@ -687,7 +687,7 @@ class zentaoBot extends xuanBot } else { - $tr .= "{$task->assignedTo->realname}"; + $tr .= "" . (empty($task->assignedTo) ? $lang->task->noAssigned : $task->assignedTo->realname) . ""; } 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; } From 7d8e0d43ac866f581df992f767568076d35e1939 Mon Sep 17 00:00:00 2001 From: Wenrui LI Date: Fri, 16 Dec 2022 10:18:13 +0800 Subject: [PATCH 2/2] * handle incorrect api response for now. --- xuanxuan/extension/xuan/im/ext/bot/zentao.bot.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xuanxuan/extension/xuan/im/ext/bot/zentao.bot.php b/xuanxuan/extension/xuan/im/ext/bot/zentao.bot.php index ff44b2c78b..873e2c57d3 100644 --- a/xuanxuan/extension/xuan/im/ext/bot/zentao.bot.php +++ b/xuanxuan/extension/xuan/im/ext/bot/zentao.bot.php @@ -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 .= "" . (empty($task->assignedTo) ? $lang->task->noAssigned : $task->assignedTo->realname) . ""; + $tr .= "" . (empty($task->assignedTo) ? $lang->task->noAssigned : (is_object($task->assignedTo) ? $task->assignedTo->realname : $task->assignedTo)) . ""; } break; case 'actions':