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

* finish task #2783.

Browse Source
This commit is contained in:
wangyidong
2016-12-01 15:36:25 +08:00
parent e472df69de
commit 75c4c563f5
5 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+3 -5
View File
@@ -653,10 +653,9 @@ class taskModel extends model
->setDefault('status', 'done')
->setDefault('finishedBy, lastEditedBy', $this->app->user->account)
->setDefault('finishedDate, lastEditedDate', $now)
->remove('comment,files,labels,thisConsume')
->remove('comment,files,labels')
->get();
if($task->finishedDate == substr($now, 0, 10)) $task->finishedDate = $now;
if(!isset($task->consumed)) $task->consumed = $oldTask->consumed + $this->post->thisConsume;
if(!is_numeric($task->consumed)) die(js::error($this->lang->task->error->consumedNumber));
@@ -668,7 +667,7 @@ class taskModel extends model
->setDefault('task', $taskID)
->setDefault('date', date(DT_DATE1))
->setDefault('left', 0)
->remove('finishedDate,comment,assignedTo,files,labels,consumed,thisConsume')
->remove('finishedDate,comment,assignedTo,files,labels,consumed')
->get();
$estimate->consumed = $consumed;
if($estimate->consumed) $this->addTaskEstimate($estimate);
@@ -813,8 +812,7 @@ class taskModel extends model
$task->files = $this->loadModel('file')->getByObject('task', $taskID);
/* Get related test cases. */
$cases = $this->dao->select('id, title')->from(TABLE_CASE)->where('story')->eq($task->story)->andWhere('storyVersion')->eq($task->storyVersion)->fetchPairs();
if($cases) $task->cases = $cases;
if($task->story)$this->cases = $this->dao->select('id, title')->from(TABLE_CASE)->where('story')->eq($task->story)->andWhere('storyVersion')->eq($task->storyVersion)->fetchPairs();
return $this->processTask($task);
}