From 8e003ff4491edf5c32a2cfad27fc9235d40822b6 Mon Sep 17 00:00:00 2001
From: wangyidong <wyd621@163.com>
Date: Mon, 10 May 2021 11:15:31 +0800
Subject: [PATCH]  * fix error.

---
 module/project/model.php                              |  2 +-
 module/testtask/model.php                             | 11 ++++++++++-
 xuanxuan/module/im/ext/model/class/xuanxuan.class.php |  7 +------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/module/project/model.php b/module/project/model.php
index 4d68523703..fa72f03ac8 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -674,7 +674,7 @@ class projectModel extends model
             if(isset($project->budget) and $program->budget != 0)
             {
                 $availableBudget = $this->loadModel('program')->getBudgetLeft($program);
-                if($project->budget > $availableBudget) dao::$errors['budget'] = $this->lang->project->beyondParentBudget;
+                if($project->budget > $availableBudget) dao::$errors['budget'] = $this->lang->program->beyondParentBudget;
             }
 
             /* Judge products not empty. */
diff --git a/module/testtask/model.php b/module/testtask/model.php
index cd7fd5c583..02109736cc 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -1429,7 +1429,16 @@ class testtaskModel extends model
                 foreach(explode(',', trim($run->stage, ',')) as $stage) echo $this->lang->testcase->stageList[$stage] . '<br />';
                 break;
             case 'status':
-                echo $caseChanged ? "<span class='warning'>{$this->lang->testcase->changed}</span>" : $this->processStatus('testcase', $run);
+                if($caseChanged)
+                {
+                    echo "<span class='warning'>{$this->lang->testcase->changed}</span>";
+                }
+                else
+                {
+                    $status = $this->processStatus('testcase', $run);
+                    if($run->status == $status) $status = $this->processStatus('testtask', $run);
+                    echo $status;
+                }
                 break;
             case 'precondition':
                 echo $run->precondition;
diff --git a/xuanxuan/module/im/ext/model/class/xuanxuan.class.php b/xuanxuan/module/im/ext/model/class/xuanxuan.class.php
index 00f5a71c2b..47c7ab276c 100644
--- a/xuanxuan/module/im/ext/model/class/xuanxuan.class.php
+++ b/xuanxuan/module/im/ext/model/class/xuanxuan.class.php
@@ -116,12 +116,7 @@ class xuanxuanIm extends imModel
 
     public function chatAddAction($chatId = '', $action = '', $actorId = '', $result = '', $comment = '')
     {
-        if(!$this->loadModel('action')->checkLogLevel('chat', $action)) return;
-
-        $account = $this->dao->select('account')->from(TABLE_USER)->where('id')->eq($actorId)->fetch('account');
-        $actor   = !empty($account) ? $account : '';
-        $extra   = json_encode(array('actorId' => $actorId));
-        $this->loadModel('action')->create('chat', $chatId, $action, $comment, $extra, $actor);
+        return;
     }
 
     public function userAddAction($user, $actionType, $result, $comment = '', $common = false)