diff --git a/extension/lite/task/ext/lang/de/lite.php b/extension/lite/task/ext/lang/de/lite.php index a4f0b3a012..e0ff585f0d 100644 --- a/extension/lite/task/ext/lang/de/lite.php +++ b/extension/lite/task/ext/lang/de/lite.php @@ -27,6 +27,7 @@ $lang->task->copy = 'Copy Task'; $lang->task->waitTask = 'Waiting Task'; $lang->task->region = 'Region'; $lang->task->lane = 'Lane'; +$lang->task->execution = 'Execution'; $lang->task->module = 'Module'; $lang->task->allModule = 'All Module'; diff --git a/extension/lite/task/ext/lang/en/lite.php b/extension/lite/task/ext/lang/en/lite.php index a4f0b3a012..e0ff585f0d 100644 --- a/extension/lite/task/ext/lang/en/lite.php +++ b/extension/lite/task/ext/lang/en/lite.php @@ -27,6 +27,7 @@ $lang->task->copy = 'Copy Task'; $lang->task->waitTask = 'Waiting Task'; $lang->task->region = 'Region'; $lang->task->lane = 'Lane'; +$lang->task->execution = 'Execution'; $lang->task->module = 'Module'; $lang->task->allModule = 'All Module'; diff --git a/extension/lite/task/ext/lang/fr/lite.php b/extension/lite/task/ext/lang/fr/lite.php index a4f0b3a012..e0ff585f0d 100644 --- a/extension/lite/task/ext/lang/fr/lite.php +++ b/extension/lite/task/ext/lang/fr/lite.php @@ -27,6 +27,7 @@ $lang->task->copy = 'Copy Task'; $lang->task->waitTask = 'Waiting Task'; $lang->task->region = 'Region'; $lang->task->lane = 'Lane'; +$lang->task->execution = 'Execution'; $lang->task->module = 'Module'; $lang->task->allModule = 'All Module'; diff --git a/extension/lite/task/ext/lang/zh-cn/lite.php b/extension/lite/task/ext/lang/zh-cn/lite.php index a8e772b5d3..2e27ea6b74 100644 --- a/extension/lite/task/ext/lang/zh-cn/lite.php +++ b/extension/lite/task/ext/lang/zh-cn/lite.php @@ -27,6 +27,7 @@ $lang->task->copy = '复制任务'; $lang->task->waitTask = '未开始的任务'; $lang->task->region = '所属区域'; $lang->task->lane = '所属泳道'; +$lang->task->execution = '所属看板'; $lang->task->module = '所属目录'; $lang->task->allModule = '所有目录'; diff --git a/module/task/model.php b/module/task/model.php index b259f9283f..b9bf9c30c1 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -4652,6 +4652,10 @@ class taskModel extends model $canView = common::hasPriv('task', 'view'); $rows = array(); if($showBranch) $showBranch = isset($this->config->execution->task->showBranch) ? $this->config->execution->task->showBranch : 1; + + $moduleList = $this->loadModel('tree')->getTaskOptionMenu($executionID); + $projectList = $this->loadModel('project')->getPairs(); + $executionList = $this->loadModel('execution')->getPairs(); foreach($tasks as $task) { $task->assignedTo = $this->printAssignedHtml($task, $users, false); @@ -4735,6 +4739,10 @@ class taskModel extends model $task->parent = 0; } + $task->module = zget($moduleList, $task->module, ''); + $task->project = zget($projectList, $task->project, ''); + $task->execution = zget($executionList, $task->execution, ''); + $rows[] = $task; if(!empty($children))