* Finish task #107588.

This commit is contained in:
chaideqing
2023-12-06 05:33:19 +00:00
parent 0c3a8a7ef1
commit 12bdc09095
2 changed files with 4 additions and 2 deletions
+1 -1
View File
@@ -28,7 +28,7 @@ $config->task->editor->pause = array('id' => 'comment', 'tools' => 'simpleToo
$config->task->removeFields = 'objectTypeList,productList,executionList,gitlabID,gitlabProjectID,product';
$config->task->exportFields = '
id, execution, module, story, fromBug,
id, project, execution, module, story, fromBug,
name, desc,
type, pri,estStarted, realStarted, deadline, status,estimate, consumed, left,
mailto, progress, mode,
+3 -1
View File
@@ -2169,7 +2169,8 @@ class task extends control
/* Get users and executions. */
$users = $this->loadModel('user')->getPairs('noletter');
$executions = $this->execution->getPairs($execution->project, 'all', 'all|nocode');
$projects = $this->loadModel('project')->getPairs();
$executions = $this->execution->getPairs(0, 'all', 'all|nocode');
/* Get related objects id lists. */
$relatedStoryIdList = array();
@@ -2297,6 +2298,7 @@ class task extends control
$task->fromBug = empty($task->fromBug) ? '' : "#$task->fromBug " . $bugs[$task->fromBug]->title;
if(isset($projects[$task->project])) $task->project = $projects[$task->project] . "(#$task->project)";
if(isset($executions[$task->execution])) $task->execution = $executions[$task->execution] . "(#$task->execution)";
if(isset($taskLang->typeList[$task->type])) $task->type = $taskLang->typeList[$task->type];
if(isset($taskLang->priList[$task->pri])) $task->pri = $taskLang->priList[$task->pri];