* Fix bug #39333.
This commit is contained in:
@@ -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';
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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 = '所有目录';
|
||||
|
||||
@@ -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))
|
||||
|
||||
Reference in New Issue
Block a user