From 61d117d4869124bead8a48809ced8daea46d6833 Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Tue, 13 Oct 2020 10:56:04 +0800
Subject: [PATCH] * Fix bug#3545.

---
 module/project/model.php    | 12 ++++++------
 module/testreport/model.php |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/module/project/model.php b/module/project/model.php
index 915c4bbd68..b9eddf6022 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1364,7 +1364,6 @@ class projectModel extends model
     {
         $this->loadModel('task');
 
-        /* Update tasks. */
         $tasks = $this->dao->select('id, project, assignedTo, story, consumed,status')->from(TABLE_TASK)->where('id')->in($this->post->tasks)->fetchAll('id');
         foreach($tasks as $task)
         {
@@ -1374,6 +1373,7 @@ class projectModel extends model
 
             $data = new stdclass();
             $data->project = $projectID;
+            $data->status  = $task->consumed > 0 ? 'doing' : 'wait';
 
             if($task->status == 'cancel')
             {
@@ -1381,12 +1381,12 @@ class projectModel extends model
                 $data->canceledDate = null;
             }
 
-            $data->status = $task->consumed > 0 ? 'doing' : 'wait';
-            $this->dao->update(TABLE_TASK)->data($data)->where('id')->in($this->post->tasks)->exec();
-            $this->loadModel('action')->create('task', $task->id, 'moved', '', $task->project);
-
+            /* Update tasks. */
+            $this->dao->update(TABLE_TASK)->data($data)->where('id')->eq($task->id)->exec();
             unset($data->status);
-            $this->dao->update(TABLE_TASK)->data($data)->where('parent')->in($this->post->tasks)->exec();
+            $this->dao->update(TABLE_TASK)->data($data)->where('parent')->eq($task->id)->exec();
+
+            $this->loadModel('action')->create('task', $task->id, 'moved', '', $task->project);
         }
 
         /* Remove empty story. */
diff --git a/module/testreport/model.php b/module/testreport/model.php
index 5e9f74a0b1..31b097dd97 100644
--- a/module/testreport/model.php
+++ b/module/testreport/model.php
@@ -367,7 +367,7 @@ class testreportModel extends model
      *
      * @param  int    $reportID
      * @access public
-     * @return void
+     * @return array
      */
     public function getCaseIdList($reportID)
     {