* Fix bug#3545.

This commit is contained in:
qiyu-xie
2020-10-13 10:58:53 +08:00
parent 7509e74182
commit 61d117d486
2 changed files with 7 additions and 7 deletions
+6 -6
View File
@@ -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. */
+1 -1
View File
@@ -367,7 +367,7 @@ class testreportModel extends model
*
* @param int $reportID
* @access public
* @return void
* @return array
*/
public function getCaseIdList($reportID)
{