* finish task#1023.

2013-01-04 07:52:39 +00:00
parent 42bce933a8
commit 587cb3a918
1 changed files with 4 additions and 1 deletions
@@ -258,8 +258,9 @@ class taskModel extends model
                    case 'done':
                    {
                        $task->left = 0;
-                        if(!$task->finishedBy)   $task->finishedBy = $this->app->user->account;
+                        if(!$task->finishedBy)   $task->finishedBy   = $this->app->user->account;
                        if(!$task->finishedDate) $task->finishedDate = $now;
+                        if($task->closedReason)  $task->closedDate   = $now;
                    }
                    break;
                    case 'cancel':
@@ -314,6 +315,8 @@ class taskModel extends model
                    ->where('id')->eq((int)$taskID)
                    ->exec();

+                if($task->status == 'done' and $task->closedReason) $this->dao->update(TABLE_TASK)->set('status')->eq('closed')->where('id')->eq($taskID)->exec();
+
                if($oldTask->story != false) $this->loadModel('story')->setStage($oldTask->story);
                if(!dao::isError()) 
                {