diff --git a/module/task/config.php b/module/task/config.php index f4ca4b895a..6939a4179f 100644 --- a/module/task/config.php +++ b/module/task/config.php @@ -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, diff --git a/module/task/control.php b/module/task/control.php index ee4b5fc040..acea454510 100755 --- a/module/task/control.php +++ b/module/task/control.php @@ -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];