From 65a9ba9ef3379873492627e5866538ddaa630ba1 Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Thu, 27 Apr 2017 09:12:52 +0800 Subject: [PATCH] * finish task #2991. --- module/group/lang/resource.php | 9 ++++---- module/project/view/task.html.php | 6 ++++++ module/task/control.php | 34 +++++++++++++++++++++++++++++++ module/task/lang/en.php | 3 ++- module/task/lang/zh-cn.php | 3 ++- 5 files changed, 49 insertions(+), 6 deletions(-) diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 65eac2d798..52525a82c0 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -360,18 +360,20 @@ $lang->project->methodOrder[190] = 'all'; /* Task. */ $lang->resource->task = new stdclass(); $lang->resource->task->create = 'create'; -$lang->resource->task->batchCreate = 'batchCreate'; -$lang->resource->task->batchEdit = 'batchEdit'; $lang->resource->task->edit = 'edit'; $lang->resource->task->assignTo = 'assign'; -$lang->resource->task->batchAssignTo = 'batchAssignTo'; $lang->resource->task->start = 'start'; $lang->resource->task->pause = 'pause'; $lang->resource->task->restart = 'restart'; $lang->resource->task->finish = 'finish'; $lang->resource->task->cancel = 'cancel'; $lang->resource->task->close = 'close'; +$lang->resource->task->batchCreate = 'batchCreate'; +$lang->resource->task->batchEdit = 'batchEdit'; $lang->resource->task->batchClose = 'batchClose'; +$lang->resource->task->batchCancel = 'batchCancel'; +$lang->resource->task->batchAssignTo = 'batchAssignTo'; +$lang->resource->task->batchChangeModule = 'batchChangeModule'; $lang->resource->task->activate = 'activate'; $lang->resource->task->delete = 'delete'; $lang->resource->task->view = 'view'; @@ -381,7 +383,6 @@ $lang->resource->task->recordEstimate = 'recordEstimate'; $lang->resource->task->editEstimate = 'editEstimate'; $lang->resource->task->deleteEstimate = 'deleteEstimate'; $lang->resource->task->report = 'reportChart'; -$lang->resource->task->batchChangeModule = 'batchChangeModule'; $lang->task->methodOrder[5] = 'create'; $lang->task->methodOrder[10] = 'batchCreate'; diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php index f5bde201ae..46b83bff8a 100644 --- a/module/project/view/task.html.php +++ b/module/project/view/task.html.php @@ -56,6 +56,7 @@ js::set('browseType', $browseType); edit, $misc); echo ""; echo "