diff --git a/module/task/control.php b/module/task/control.php index d5f35096b7..af3006b87c 100755 --- a/module/task/control.php +++ b/module/task/control.php @@ -401,10 +401,6 @@ class task extends control $taskConsumed = 0; if($taskID) $taskConsumed = $this->dao->select('consumed')->from(TABLE_TASK)->where('id')->eq($taskID)->andWhere('parent')->eq(0)->fetch('consumed'); - /* When common task are child tasks, query whether common task are consumed. */ - $taskConsumed = 0; - if($taskID) $taskConsumed = $this->dao->select('consumed')->from(TABLE_TASK)->where('id')->eq($taskID)->andWhere('parent')->eq(0)->fetch('consumed'); - if(!empty($_POST)) { $mails = $this->task->batchCreate($executionID, $extra); diff --git a/module/task/model.php b/module/task/model.php index b518bc8b34..414987b12f 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -405,7 +405,7 @@ class taskModel extends model $data[$i]->openedBy = $this->app->user->account; $data[$i]->openedDate = $now; $data[$i]->parent = $tasks->parent[$i]; - $data[$i]->vision = isset($tasks->vision[$i]) ? $tasks->vision[$i] : 'rnd'; + $data[$i]->vision = isset($tasks->vision[$i]) ? $tasks->vision[$i] : $this->config->vision; if($story) $data[$i]->storyVersion = $this->loadModel('story')->getVersion($data[$i]->story); if($assignedTo) $data[$i]->assignedDate = $now; if(strpos($this->config->task->create->requiredFields, 'estStarted') !== false and empty($estStarted)) $data[$i]->estStarted = '';