diff --git a/module/task/control.php b/module/task/control.php index 3cc63bfbb6..4a354f7f67 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -127,7 +127,6 @@ class task extends control } $stories = $this->story->getProjectStoryPairs($projectID); - $stories['ditto'] = $this->lang->task->ditto; $members = $this->project->getTeamMemberPairs($projectID, 'nodeleted'); $title = $project->name . $this->lang->colon . $this->lang->task->create; $position[] = html::a($taskLink, $project->name); diff --git a/module/task/model.php b/module/task/model.php index 72e05461da..0127a2e4a1 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -94,12 +94,12 @@ class taskModel extends model $mails = array(); for($i = 0; $i < $this->config->task->batchCreate; $i++) { - if($tasks->type[$i] != '' and $tasks->name[$i] != '' and $tasks->pri[$i] != 0) + if($tasks->type[$i] != '' and $tasks->name[$i] != '') { $data[$i] = new stdclass(); - $data[$i]->story = $tasks->story[$i] != 'ditto' ? ($tasks->story[$i] ? $tasks->story[$i] : 0) : ($i == 0 ? 0 : $data[$i-1]->story); - $data[$i]->type = $tasks->type[$i] == 'ditto' ? ($i == 0 ? '' : $data[$i-1]->type) : $tasks->type[$i]; - $data[$i]->assignedTo = $tasks->assignedTo[$i] == 'ditto' ? ($i == 0 ? '' : $data[$i-1]->assignedTo) : $tasks->assignedTo[$i]; + $data[$i]->story = $tasks->story[$i] == 'ditto' ? (isset($data[$i-1]) and isset($data[$i-1]->story) ? $data[$i-1]->story : 0) : $tasks->story[$i] ? $tasks->story[$i] : 0; + $data[$i]->type = $tasks->type[$i] == 'ditto' ? (isset($data[$i-1]) and isset($data[$i-1]->type) ? $data[$i-1]->type : 0) : $tasks->type[$i]; + $data[$i]->assignedTo = $tasks->assignedTo[$i] == 'ditto' ? (isset($data[$i-1]) and isset($data[$i-1]->assignedTo) ? $data[$i-1]->assignedTo : 0) : $tasks->assignedTo[$i]; $data[$i]->name = $tasks->name[$i]; $data[$i]->desc = $tasks->desc[$i]; $data[$i]->pri = $tasks->pri[$i]; diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php index f686bc109e..2e9f7a365f 100644 --- a/module/task/view/batchcreate.html.php +++ b/module/task/view/batchcreate.html.php @@ -26,11 +26,22 @@ task->desc;?> task->pri;?> + task->batchCreate; $i++):?> - - task->typeList['ditto'] = $lang->task->ditto; $type = $i == 0 ? '' : 'ditto'; - $members['ditto'] = $lang->task->ditto; $member = $i == 0 ? '' : 'ditto'; + lang->task->ditto; + $lang->task->typeList['ditto'] = $lang->task->ditto; + $members['ditto'] = $lang->task->ditto; + $story = $type = $member = 'ditto'; + } ?>