diff --git a/module/task/control.php b/module/task/control.php index 716aec9b34..1bf053ad8c 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -193,7 +193,7 @@ class task extends control * @access public * @return void */ - public function batchCreate($projectID = 0, $storyID = 0, $moduleID = 0, $taskID = 0, $iframe = 0, $isChildren = false) + public function batchCreate($projectID = 0, $storyID = 0, $moduleID = 0, $taskID = 0, $iframe = 0) { $project = $this->project->getById($projectID); $taskLink = $this->createLink('project', 'browse', "projectID=$projectID&tab=task"); @@ -225,7 +225,7 @@ class task extends control $position[] = $this->lang->task->common; $position[] = $this->lang->task->batchCreate; - if($isChildren) $this->view->parentTitle = $this->dao->select('name')->from(TABLE_TASK)->where('id')->eq($taskID)->fetch('name'); + if($taskID) $this->view->parentTitle = $this->dao->select('name')->from(TABLE_TASK)->where('id')->eq($taskID)->fetch('name'); $this->view->title = $title; $this->view->position = $position; @@ -233,7 +233,6 @@ class task extends control $this->view->stories = $stories; $this->view->modules = $modules; $this->view->parent = $taskID; - $this->view->isChildren = $isChildren; $this->view->storyID = $storyID; $this->view->story = $this->story->getByID($storyID); $this->view->storyTasks = $this->task->getStoryTaskCounts(array_keys($stories), $projectID); diff --git a/module/task/model.php b/module/task/model.php index 7408186f43..599968ddae 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -2288,7 +2288,7 @@ class taskModel extends model common::printIcon('task', 'edit', "taskID=$task->id", $task, 'list'); if(empty($task->team) or empty($task->children)) { - common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id&ifame=0&isChildren=1", $task, 'list', 'plus', '', '', '', '', $this->lang->task->children); + common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id&ifame=0", $task, 'list', 'plus', '', '', '', '', $this->lang->task->children); } break; } diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php index 2f85283b83..a372edbb1e 100644 --- a/module/task/view/batchcreate.html.php +++ b/module/task/view/batchcreate.html.php @@ -17,7 +17,7 @@ icons['task']);?> icons['batchCreate']);?> - + task->batchCreateChildren;?>