* code for task#2154.

This commit is contained in:
xia0ta0
2014-12-11 17:34:18 +08:00
parent 6fec0feae6
commit f67741ebcf
3 changed files with 13 additions and 7 deletions

View File

@@ -575,7 +575,8 @@ class taskModel extends model
->setDefault('status', 'done')
->setDefault('finishedBy, lastEditedBy', $this->app->user->account)
->setDefault('finishedDate, lastEditedDate', $now)
->remove('comment')->get();
->remove('comment,files,labels')
->get();
if(!is_numeric($task->consumed)) die(js::error($this->lang->task->error->consumedNumber));
@@ -586,7 +587,8 @@ class taskModel extends model
->setDefault('task', $taskID)
->setDefault('date', date(DT_DATE1))
->setDefault('left', 0)
->remove('finishedDate,comment,assignedTo')->get();
->remove('finishedDate,comment,assignedTo,files,labels')
->get();
$estimate->consumed = $estimate->consumed - $oldTask->consumed;
if($estimate->consumed) $this->addTaskEstimate($estimate);