diff --git a/module/task/control.php b/module/task/control.php index 80779e7d5a..9389c3cc73 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -122,7 +122,7 @@ class task extends control } $stories = $this->story->getProjectStoryPairs($projectID); - $stories['same'] = $this->lang->task->same; + $stories['ditto'] = $this->lang->task->ditto; $members = $this->project->getTeamMemberPairs($projectID, 'nodeleted'); $header['title'] = $project->name . $this->lang->colon . $this->lang->task->create; $position[] = html::a($taskLink, $project->name); diff --git a/module/task/lang/en.php b/module/task/lang/en.php index af42238ecc..c1948c412f 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -75,8 +75,7 @@ $lang->task->lastEditedBy = 'Last Edited By'; $lang->task->lastEditedDate = 'Last Edited Date'; $lang->task->lastEdited = 'Last Edited'; -$lang->task->same = 'The same as above'; -$lang->task->notes = '(Notes: the name, type, pri and estimate must be written, otherwise it is no use)'; +$lang->task->ditto = 'Ditto'; $lang->task->statusList[''] = ''; $lang->task->statusList['wait'] = 'Pending'; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index a318a2b725..8141660b67 100644 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -75,8 +75,7 @@ $lang->task->lastEditedBy = '最后修改'; $lang->task->lastEditedDate = '最后修改日期'; $lang->task->lastEdited = '最后编辑'; -$lang->task->same = '同上'; -$lang->task->notes = '(注:“任务类型”、“任务名称”、“优先级”和“预计工时”必需填写,否则此行无效)'; +$lang->task->ditto = '同上'; $lang->task->statusList[''] = ''; $lang->task->statusList['wait'] = '未开始'; diff --git a/module/task/model.php b/module/task/model.php index fef11e98cf..c4c8eca6ed 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -94,8 +94,8 @@ class taskModel extends model { if($tasks->type[$i] != '' and $tasks->name[$i] != '' and $tasks->pri[$i] != 0 and $tasks->estimate[$i] != '') { - $data[$i]->story = $tasks->story[$i] != 'same' ? $tasks->story[$i] : ($i == 0 ? 0 : $data[$i-1]->story); - $data[$i]->type = $tasks->type[$i] == 'same' ? ($i == 0 ? '' : $data[$i-1]->type) : $tasks->type[$i]; + $data[$i]->story = $tasks->story[$i] != 'ditto' ? $tasks->story[$i] : ($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]->name = $tasks->name[$i]; $data[$i]->desc = $tasks->desc[$i]; $data[$i]->assignedTo = $tasks->assignedTo[$i]; diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php index 0b3f0de755..cb6e60b8a9 100644 --- a/module/task/view/batchcreate.html.php +++ b/module/task/view/batchcreate.html.php @@ -19,35 +19,30 @@