diff --git a/module/bug/config.php b/module/bug/config.php index 09f22203bf..b6361be210 100644 --- a/module/bug/config.php +++ b/module/bug/config.php @@ -237,6 +237,11 @@ $config->bug->datatable->fieldList['task']['fixed'] = 'no'; $config->bug->datatable->fieldList['task']['width'] = '120'; $config->bug->datatable->fieldList['task']['required'] = 'no'; +$config->bug->datatable->fieldList['toTask']['title'] = 'toTask'; +$config->bug->datatable->fieldList['toTask']['fixed'] = 'no'; +$config->bug->datatable->fieldList['toTask']['width'] = '120'; +$config->bug->datatable->fieldList['toTask']['required'] = 'no'; + $config->bug->datatable->fieldList['keywords']['title'] = 'keywords'; $config->bug->datatable->fieldList['keywords']['fixed'] = 'no'; $config->bug->datatable->fieldList['keywords']['width'] = '100'; diff --git a/module/bug/control.php b/module/bug/control.php index 50ffbb6349..b91cba7691 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -148,8 +148,9 @@ class bug extends control $storyIdList = $taskIdList = array(); foreach($bugs as $bug) { - if($bug->story) $storyIdList[$bug->story] = $bug->story; - if($bug->task) $taskIdList[$bug->task] = $bug->task; + if($bug->story) $storyIdList[$bug->story] = $bug->story; + if($bug->task) $taskIdList[$bug->task] = $bug->task; + if($bug->toTask) $taskIdList[$bug->toTask] = $bug->toTask; } $storyList = $storyIdList ? $this->loadModel('story')->getByList($storyIdList) : array(); $taskList = $taskIdList ? $this->loadModel('task')->getByList($taskIdList) : array(); diff --git a/module/bug/model.php b/module/bug/model.php index 033fc689e7..27ef22c657 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -2603,6 +2603,13 @@ class bugModel extends model echo common::hasPriv('task', 'view') ? html::a(helper::createLink('task', 'view', "taskID=$task->id", 'html', true), $task->name, '', "class='iframe'") : $task->name; } break; + case 'toTask': + if(isset($tasks[$bug->toTask])) + { + $task = $tasks[$bug->toTask]; + echo common::hasPriv('task', 'view') ? html::a(helper::createLink('task', 'view', "taskID=$task->id", 'html', true), $task->name, '', "class='iframe'") : $task->name; + } + break; case 'type': echo zget($this->lang->bug->typeList, $bug->type); break;