diff --git a/module/task/control.php b/module/task/control.php index 2fcc8e37fa..68856871b9 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -163,6 +163,7 @@ class task extends control $stories = $this->story->getProjectStoryPairs($projectID); $members = $this->project->getTeamMemberPairs($projectID, 'nodeleted'); + $modules = $this->loadModel('tree')->getTaskOptionMenu($projectID); $title = $project->name . $this->lang->colon . $this->lang->task->batchCreate; $position[] = html::a($taskLink, $project->name); $position[] = $this->lang->task->common; @@ -172,6 +173,7 @@ class task extends control $this->view->position = $position; $this->view->project = $project; $this->view->stories = $stories; + $this->view->modules = $modules; $this->view->storyID = $storyID; $this->view->members = $members; $this->display(); diff --git a/module/task/model.php b/module/task/model.php index 1ececcf37d..6cc4f4519a 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -107,8 +107,9 @@ class taskModel extends model if(empty($tasks->name[$i])) continue; $data[$i] = new stdclass(); - $data[$i]->story = $tasks->story[$i] == 'ditto' ? (isset($data[$i-1]) ? $data[$i-1]->story : 0) : ($tasks->story[$i] ? $tasks->story[$i] : 0); - $data[$i]->type = $tasks->type[$i] == 'ditto' ? (isset($data[$i-1]) ? $data[$i-1]->type : 0) : $tasks->type[$i]; + $data[$i]->story = $tasks->story[$i] == 'ditto' ? (isset($data[$i-1]) ? $data[$i-1]->story : 0) : ($tasks->story[$i] ? $tasks->story[$i] : 0); + $data[$i]->type = $tasks->type[$i] == 'ditto' ? (isset($data[$i-1]) ? $data[$i-1]->type : 0) : $tasks->type[$i]; + $data[$i]->module = $tasks->module[$i] == 'ditto' ? (isset($data[$i-1]) ? $data[$i-1]->module : 0) : $tasks->module[$i]; $data[$i]->assignedTo = $tasks->assignedTo[$i] == 'ditto' ? (isset($data[$i-1]) ? $data[$i-1]->assignedTo : 0) : $tasks->assignedTo[$i]; $data[$i]->name = htmlspecialchars($tasks->name[$i]); $data[$i]->desc = str_replace(array("\r\n", "\n"), '
', htmlspecialchars($tasks->desc[$i])); diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php index b9d2465e8b..b2eaedd47c 100644 --- a/module/task/view/batchcreate.html.php +++ b/module/task/view/batchcreate.html.php @@ -21,6 +21,7 @@ task->story;?> task->name;?> typeAB;?> + task->module?> task->assignedTo;?> task->estimateAB;?> task->desc;?> @@ -31,6 +32,7 @@ $stories['ditto'] = $this->lang->task->ditto; $lang->task->typeList['ditto'] = $lang->task->ditto; $members['ditto'] = $lang->task->ditto; + $modules['ditto'] = $lang->task->ditto; ?> task->batchCreate; $i++):?> @@ -56,6 +59,7 @@ task->typeList, $type, 'class=select-1');?> +