diff --git a/module/search/lang/de.php b/module/search/lang/de.php index d8baa10211..c54519796a 100644 --- a/module/search/lang/de.php +++ b/module/search/lang/de.php @@ -92,8 +92,9 @@ $lang->search->modules['story'] = 'Story'; $lang->search->modules['issue'] = 'Issue'; $lang->search->modules['risk'] = 'Risk'; -$lang->search->objecttypelist['story'] = $lang->srcommon; -$lang->search->objecttypelist['requirement'] = $lang->urcommon; -$lang->search->objecttypelist['stage'] = $lang->execution->stage; -$lang->search->objecttypelist['sprint'] = $lang->execution->sprint; -$lang->search->objectTypeList['sprint'] = $lang->executionCommon; +$lang->search->objectTypeList['story'] = $lang->SRCommon; +$lang->search->objectTypeList['requirement'] = $lang->URCommon; +$lang->search->objectTypeList['stage'] = $lang->execution->stage; +$lang->search->objectTypeList['sprint'] = $lang->executionCommon; +$lang->search->objectTypeList['commonIssue'] = 'Issue'; +$lang->search->objectTypeList['stakeholderIssue'] = 'Stakeholder Issue'; diff --git a/module/search/lang/en.php b/module/search/lang/en.php index 10c5b1c6ee..0f43c6af58 100644 --- a/module/search/lang/en.php +++ b/module/search/lang/en.php @@ -92,7 +92,9 @@ $lang->search->modules['story'] = 'Story'; $lang->search->modules['issue'] = 'Issue'; $lang->search->modules['risk'] = 'Risk'; -$lang->search->objecttypelist['story'] = $lang->srcommon; -$lang->search->objecttypelist['requirement'] = $lang->urcommon; -$lang->search->objecttypelist['stage'] = $lang->execution->stage; -$lang->search->objectTypeList['sprint'] = $lang->executionCommon; +$lang->search->objectTypeList['story'] = $lang->SRCommon; +$lang->search->objectTypeList['requirement'] = $lang->URCommon; +$lang->search->objectTypeList['stage'] = $lang->execution->stage; +$lang->search->objectTypeList['sprint'] = $lang->executionCommon; +$lang->search->objectTypeList['commonIssue'] = 'Issue'; +$lang->search->objectTypeList['stakeholderIssue'] = 'Stakeholder Issue'; diff --git a/module/search/lang/fr.php b/module/search/lang/fr.php index d969be9f71..99c6f9fd3d 100644 --- a/module/search/lang/fr.php +++ b/module/search/lang/fr.php @@ -92,7 +92,9 @@ $lang->search->modules['story'] = 'Story'; $lang->search->modules['issue'] = 'Issue'; $lang->search->modules['risk'] = 'Risk'; -$lang->search->objecttypelist['story'] = $lang->srcommon; -$lang->search->objecttypelist['requirement'] = $lang->urcommon; -$lang->search->objecttypelist['stage'] = $lang->execution->stage; -$lang->search->objectTypeList['sprint'] = $lang->executionCommon; +$lang->search->objectTypeList['story'] = $lang->SRCommon; +$lang->search->objectTypeList['requirement'] = $lang->URCommon; +$lang->search->objectTypeList['stage'] = $lang->execution->stage; +$lang->search->objectTypeList['sprint'] = $lang->executionCommon; +$lang->search->objectTypeList['commonIssue'] = 'Issue'; +$lang->search->objectTypeList['stakeholderIssue'] = 'Stakeholder Issue'; diff --git a/module/search/lang/vi.php b/module/search/lang/vi.php index b99c65aabb..30c0ef3c75 100644 --- a/module/search/lang/vi.php +++ b/module/search/lang/vi.php @@ -92,7 +92,9 @@ $lang->search->modules['story'] = 'Story'; $lang->search->modules['issue'] = 'Issue'; $lang->search->modules['risk'] = 'Risk'; -$lang->search->objectTypeList['story'] = $lang->SRCommon; -$lang->search->objectTypeList['requirement'] = $lang->URCommon; -$lang->search->objectTypeList['stage'] = $lang->execution->stage; -$lang->search->objectTypeList['sprint'] = $lang->executionCommon; +$lang->search->objectTypeList['story'] = $lang->SRCommon; +$lang->search->objectTypeList['requirement'] = $lang->URCommon; +$lang->search->objectTypeList['stage'] = $lang->execution->stage; +$lang->search->objectTypeList['sprint'] = $lang->executionCommon; +$lang->search->objectTypeList['commonIssue'] = 'Issue'; +$lang->search->objectTypeList['stakeholderIssue'] = 'Stakeholder Issue'; diff --git a/module/search/lang/zh-cn.php b/module/search/lang/zh-cn.php index dedc55d5e8..eb60ddf544 100644 --- a/module/search/lang/zh-cn.php +++ b/module/search/lang/zh-cn.php @@ -92,7 +92,9 @@ $lang->search->modules['story'] = '需求'; $lang->search->modules['issue'] = '问题'; $lang->search->modules['risk'] = '风险'; -$lang->search->objectTypeList['story'] = $lang->SRCommon; -$lang->search->objectTypeList['requirement'] = $lang->URCommon; -$lang->search->objectTypeList['stage'] = $lang->execution->stage; -$lang->search->objectTypeList['sprint'] = $lang->executionCommon; +$lang->search->objectTypeList['story'] = $lang->SRCommon; +$lang->search->objectTypeList['requirement'] = $lang->URCommon; +$lang->search->objectTypeList['stage'] = $lang->execution->stage; +$lang->search->objectTypeList['sprint'] = $lang->executionCommon; +$lang->search->objectTypeList['commonIssue'] = '问题'; +$lang->search->objectTypeList['stakeholderIssue'] = '干系人问题'; diff --git a/module/search/lang/zh-tw.php b/module/search/lang/zh-tw.php index 7c5ef08582..f13ff36da0 100644 --- a/module/search/lang/zh-tw.php +++ b/module/search/lang/zh-tw.php @@ -92,7 +92,9 @@ $lang->search->modules['story'] = '需求'; $lang->search->modules['issue'] = '問題'; $lang->search->modules['risk'] = '風險'; -$lang->search->objecttypelist['story'] = $lang->srcommon; -$lang->search->objecttypelist['requirement'] = $lang->urcommon; -$lang->search->objecttypelist['stage'] = $lang->execution->stage; -$lang->search->objectTypeList['sprint'] = $lang->executionCommon; +$lang->search->objectTypeList['story'] = $lang->SRCommon; +$lang->search->objectTypeList['requirement'] = $lang->URCommon; +$lang->search->objectTypeList['stage'] = $lang->execution->stage; +$lang->search->objectTypeList['sprint'] = $lang->executionCommon; +$lang->search->objectTypeList['commonIssue'] = '问题'; +$lang->search->objectTypeList['stakeholderIssue'] = '干系人问题'; diff --git a/module/search/model.php b/module/search/model.php index 562dbc1fd7..7ff443d068 100644 --- a/module/search/model.php +++ b/module/search/model.php @@ -574,13 +574,19 @@ class searchModel extends model $method = 'viewstep'; } - if(strpos(',task,bug,testcase,build,release,testtask,testsuite,testreport,issue,risk,', ",$module,") !== false) + if(strpos(',task,bug,testcase,build,release,testtask,testsuite,testreport,risk,', ",$module,") !== false) { if(!isset($this->config->objectTables[$record->objectType])) continue; $table = $this->config->objectTables[$record->objectType]; $projectID = $this->dao->select('PRJ')->from($table)->where('id')->eq($record->objectID)->fetch('PRJ'); $record->url = helper::createLink($module, $method, "id={$record->objectID}", '', false, $projectID); } + elseif($module == 'issue') + { + $issue = $this->dao->select('id,PRJ,owner')->from(TABLE_ISSUE)->where('id')->eq($record->objectID)->fetch(); + $record->url = helper::createLink($module, $method, "id={$record->objectID}", '', false, $issue->PRJ); + $record->extraType = empty($issue->owner) ? 'commonIssue' : 'stakeholderIssue'; + } elseif($module == 'story') { $story = $this->dao->select('id,type')->from(TABLE_STORY)->where('id')->eq($record->objectID)->fetch(); diff --git a/module/search/view/index.html.php b/module/search/view/index.html.php index d08f3a12f3..9dbc8dd964 100644 --- a/module/search/view/index.html.php +++ b/module/search/view/index.html.php @@ -23,7 +23,7 @@ objectType == 'case' ? 'testcase' : $object->objectType; echo html::a($object->url, $object->title, '', 'title="' . strip_tags($object->title) . '"'); - if($objectType == 'story' || $objectType == 'execution') + if($objectType == 'story' || $objectType == 'execution' || $objectType == 'issue') { echo "[{$lang->search->objectTypeList[$object->extraType]} #{$object->objectID}] "; }