diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index 34ce8e85bb..a43e2882fc 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -35,8 +35,8 @@ $lang->bug->statusAB = 'Status'; $lang->bug->activatedCount = 'Activated count'; $lang->bug->activatedCountAB = 'Activated count'; $lang->bug->confirmed = 'Confirmed'; -$lang->bug->toTask = 'To taskID'; -$lang->bug->toStory = 'To storyID'; +$lang->bug->toTask = 'To task'; +$lang->bug->toStory = 'To story'; $lang->bug->mailto = 'Mailto'; $lang->bug->openedBy = 'Opened By'; $lang->bug->openedByAB = 'Opened'; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index c62a1a8901..4cb2a4b01c 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -35,8 +35,8 @@ $lang->bug->statusAB = '状态'; $lang->bug->activatedCount = '激活次数'; $lang->bug->activatedCountAB = '激活次数'; $lang->bug->confirmed = '是否确认'; -$lang->bug->toTask = '转为任务ID'; -$lang->bug->toStory = '转为需求ID'; +$lang->bug->toTask = '转为任务'; +$lang->bug->toStory = '转为需求'; $lang->bug->mailto = '抄送给'; $lang->bug->openedBy = '由谁创建'; $lang->bug->openedByAB = '创建'; diff --git a/module/bug/model.php b/module/bug/model.php index 5434d40bc3..14ec333c22 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -110,6 +110,8 @@ class bugModel extends model if($bug->duplicateBug) $bug->duplicateBugTitle = $this->dao->findById($bug->duplicateBug)->from(TABLE_BUG)->fields('title')->fetch('title'); if($bug->case) $bug->caseTitle = $this->dao->findById($bug->case)->from(TABLE_CASE)->fields('title')->fetch('title'); if($bug->linkBug) $bug->linkBugTitles = $this->dao->select('id,title')->from(TABLE_BUG)->where('id')->in($bug->linkBug)->fetchPairs(); + if($bug->toStory > 0) $bug->toStoryTitle = $this->dao->findById($bug->toStory)->from(TABLE_STORY)->fields('title')->fetch('title'); + if($bug->toTask > 0) $bug->toTaskTitle = $this->dao->findById($bug->toTask)->from(TABLE_TASK)->fields('name')->fetch('name'); $bug->files = $this->loadModel('file')->getByObject('bug', $bugID); return $bug; } diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index 34e85665e3..fd4ecb8992 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -27,11 +27,11 @@ if(!($bug->status == 'resolved' and common::printLink('bug', 'close', $params, $lang->bug->buttonClose))) echo $lang->bug->buttonClose . ' '; if($bug->status == 'active' and common::hasPriv('story', 'create')) { - common::printLink('story', 'create', "product=$bug->product&module=0&story=0&project=0&bugID=$bug->id", $lang->bug->resolutionList['tostory']) . ' '; + common::printLink('story', 'create', "product=$bug->product&module=0&story=0&project=0&bugID=$bug->id", $lang->bug->toStory) . ' '; } else { - echo $lang->bug->resolutionList['tostory'] . ' '; + echo $lang->bug->toStory . ' '; } if(!(($bug->status == 'closed' or $bug->status == 'resolved') and $bug->resolution != 'tostory' and common::printLink('bug', 'activate', $params, $lang->bug->buttonActivate))) echo $lang->bug->buttonActivate . ' '; common::printLink('bug', 'create', $copyParams, $lang->bug->buttonCopy); @@ -62,11 +62,11 @@ if(!($bug->status == 'resolved' and common::printLink('bug', 'close', $params, $lang->bug->buttonClose))) echo $lang->bug->buttonClose . ' '; if($bug->status == 'active' and common::hasPriv('bug', 'resolve')) { - common::printLink('story', 'create', "product=$bug->product&module=0&story=0&project=0&bugID=$bug->id", $lang->bug->resolutionList['tostory']) . ' '; + common::printLink('story', 'create', "product=$bug->product&module=0&story=0&project=0&bugID=$bug->id", $lang->bug->toStory) . ' '; } else { - echo $lang->bug->resolutionList['tostory'] . ' '; + echo $lang->bug->toStory . ' '; } if(!(($bug->status == 'closed' or $bug->status == 'resolved') and $bug->resolution != 'tostory' and common::printLink('bug', 'activate', $params, $lang->bug->buttonActivate))) echo $lang->bug->buttonActivate . ' '; common::printLink('bug', 'create', $copyParams, $lang->bug->buttonCopy); @@ -243,6 +243,14 @@