diff --git a/module/api/v1/entries/taskbatchcreate.php b/module/api/v1/entries/taskbatchcreate.php index 7378f0471d..03eb2b2e13 100644 --- a/module/api/v1/entries/taskbatchcreate.php +++ b/module/api/v1/entries/taskbatchcreate.php @@ -79,7 +79,7 @@ class taskBatchCreateEntry extends entry if(!$data) return $this->send400('error'); if(isset($data->data->result) and $data->data->result == 'fail') return $this->sendError(400, $data->data->message); - $tasks = $this->loadModel('task')->getByList($data->idList); + $tasks = $this->loadModel('task')->getByIdList($data->idList); return $this->send(200, array('task' => $tasks)); } } diff --git a/module/bug/zen.php b/module/bug/zen.php index 8b53dda663..38abada632 100644 --- a/module/bug/zen.php +++ b/module/bug/zen.php @@ -246,7 +246,7 @@ class bugZen extends bug $this->view->branchTagOption = $branchTagOption; $this->view->projectPairs = $this->loadModel('project')->getPairsByProgram(); $this->view->executions = $executions; - $this->view->tasks = $this->loadModel('task')->getByList($taskIdList); + $this->view->tasks = $this->loadModel('task')->getByIdList($taskIdList); $this->view->stories = $this->loadModel('story')->getByList($storyIdList); $this->view->bugs = $bugs; $this->view->users = $this->user->getPairs('noletter'); diff --git a/module/execution/control.php b/module/execution/control.php index ade42d9d37..2af40a757e 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -1098,7 +1098,7 @@ class execution extends control if($bug->toTask) $taskIdList[$bug->toTask] = $bug->toTask; } $storyList = $storyIdList ? $this->loadModel('story')->getByList($storyIdList) : array(); - $taskList = $taskIdList ? $this->loadModel('task')->getByList($taskIdList) : array(); + $taskList = $taskIdList ? $this->loadModel('task')->getByIdList($taskIdList) : array(); $showModule = !empty($this->config->datatable->bugBrowse->showModule) ? $this->config->datatable->bugBrowse->showModule : ''; diff --git a/module/my/control.php b/module/my/control.php index 4a3951fea7..c7ba7e0805 100755 --- a/module/my/control.php +++ b/module/my/control.php @@ -1163,7 +1163,7 @@ EOF; $bugs = $bugIdList ? $this->loadModel('bug')->getByIdList($bugIdList) : array(); $stories = $storyIdList ? $this->loadModel('story')->getByList($storyIdList) : array(); $todos = $todoIdList ? $this->loadModel('todo')->getByList($todoIdList) : array(); - $tasks = $taskIdList ? $this->loadModel('task')->getByList($taskIdList) : array(); + $tasks = $taskIdList ? $this->loadModel('task')->getByIdList($taskIdList) : array(); $tickets = $ticketIdList ? $this->loadModel('ticket')->getByList($ticketIdList) : array(); $products = $this->loadModel('product')->getPairs(); diff --git a/module/project/control.php b/module/project/control.php index f77bed1ab0..b1d86cb1ba 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -996,7 +996,7 @@ class project extends control if($bug->toTask) $taskIdList[$bug->toTask] = $bug->toTask; } $storyList = $storyIdList ? $this->loadModel('story')->getByList($storyIdList) : array(); - $taskList = $taskIdList ? $this->loadModel('task')->getByList($taskIdList) : array(); + $taskList = $taskIdList ? $this->loadModel('task')->getByIdList($taskIdList) : array(); $showModule = !empty($this->config->datatable->projectBug->showModule) ? $this->config->datatable->projectBug->showModule : ''; diff --git a/module/repo/model.php b/module/repo/model.php index 4aa698a83d..33b96012b2 100644 --- a/module/repo/model.php +++ b/module/repo/model.php @@ -2807,7 +2807,7 @@ class repoModel extends model } $stories = empty($storyIDs) ? array() : $this->loadModel('story')->getByList($storyIDs); $bugs = empty($bugIDs) ? array() : $this->loadModel('bug')->getByIdList($bugIDs); - $tasks = empty($taskIDs) ? array() : $this->loadModel('task')->getByList($taskIDs); + $tasks = empty($taskIDs) ? array() : $this->loadModel('task')->getByIdList($taskIDs); $titleList = array(); foreach($relationList as $key => $relation) diff --git a/module/story/test/story.class.php b/module/story/test/story.class.php index ff74d925ee..6d72de5a40 100644 --- a/module/story/test/story.class.php +++ b/module/story/test/story.class.php @@ -461,7 +461,7 @@ class storyTest if(dao::isError()) return dao::getError(); global $tester; - return $tester->loadModel('task')->getByList($taskIdList); + return $tester->loadModel('task')->getByIdList($taskIdList); } /**