diff --git a/module/bug/lang/de.php b/module/bug/lang/de.php index b1db8e9c3b..db77ae0fd0 100644 --- a/module/bug/lang/de.php +++ b/module/bug/lang/de.php @@ -160,6 +160,7 @@ $lang->bug->createBuild = 'Neu'; /* legend列表。*/ $lang->bug->legendBasicInfo = 'Basis Info'; $lang->bug->legendAttatch = 'Anlagen'; +$lang->bug->legendPRJExecStoryTask = 'Project/' . $lang->executionCommon . '/Story/Task'; $lang->bug->legendExecStoryTask = $lang->executionCommon . '/Story/Task'; $lang->bug->lblTypeAndSeverity = 'Typ/Schwere'; $lang->bug->lblSystemBrowserAndHardware = 'System/Browser'; diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index 402bcd49ed..d793b6e008 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -160,6 +160,7 @@ $lang->bug->createBuild = 'New'; /* Legend list。*/ $lang->bug->legendBasicInfo = 'Basic Info'; $lang->bug->legendAttatch = 'Files'; +$lang->bug->legendPRJExecStoryTask = 'Project/' . $lang->executionCommon . '/Story/Task'; $lang->bug->legendExecStoryTask = $lang->executionCommon . '/Story/Task'; $lang->bug->lblTypeAndSeverity = 'Type/Severity'; $lang->bug->lblSystemBrowserAndHardware = 'System/Browser'; diff --git a/module/bug/lang/fr.php b/module/bug/lang/fr.php index 25cb905ae5..c867ab655f 100644 --- a/module/bug/lang/fr.php +++ b/module/bug/lang/fr.php @@ -160,6 +160,7 @@ $lang->bug->createBuild = 'Nouveau'; /* legend列表。*/ $lang->bug->legendBasicInfo = 'Infos de Base'; $lang->bug->legendAttatch = 'Fichiers'; +$lang->bug->legendPRJExecStoryTask = 'Project/' . $lang->executionCommon . '/Story/Task'; $lang->bug->legendExecStoryTask = $lang->executionCommon . '/Story/Tâche'; $lang->bug->lblTypeAndSeverity = 'Type/Severité'; $lang->bug->lblSystemBrowserAndHardware = 'Système/Browser'; diff --git a/module/bug/lang/vi.php b/module/bug/lang/vi.php index 42862a33b5..f6495a5757 100644 --- a/module/bug/lang/vi.php +++ b/module/bug/lang/vi.php @@ -160,6 +160,7 @@ $lang->bug->createBuild = 'Mới'; /* Legend list。*/ $lang->bug->legendBasicInfo = 'Thông tin cơ bản'; $lang->bug->legendAttatch = 'Files'; +$lang->bug->legendPRJExecStoryTask = 'Project/' . $lang->executionCommon . '/Story/Task'; $lang->bug->legendExecStoryTask = $lang->executionCommon . '/Câu chuyện/Nhiệm vụ'; $lang->bug->lblTypeAndSeverity = 'Loại/Mức độ'; $lang->bug->lblSystemBrowserAndHardware = 'Hệ thống/Trình duyệt'; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index 30c19c2640..d29fa8a6eb 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -160,6 +160,7 @@ $lang->bug->createBuild = '创建'; /* legend列表。*/ $lang->bug->legendBasicInfo = '基本信息'; $lang->bug->legendAttatch = '附件'; +$lang->bug->legendPRJExecStoryTask = "项目/" . $lang->executionCommon . "/{$lang->SRCommon}/任务"; $lang->bug->legendExecStoryTask = $lang->executionCommon . "/{$lang->SRCommon}/任务"; $lang->bug->lblTypeAndSeverity = '类型/严重程度'; $lang->bug->lblSystemBrowserAndHardware = '系统/浏览器'; diff --git a/module/bug/model.php b/module/bug/model.php index 72297695c4..913347b1dc 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -440,6 +440,8 @@ class bugModel extends model ->where('t1.id')->eq((int)$bugID)->fetch(); if(!$bug) return false; + if(!empty($bug->project)) $bug->projectName = $this->dao->select('name')->from(TABLE_PROJECT)->where('id')->eq($bug->project)->fetch('name'); + $bug = $this->loadModel('file')->replaceImgURL($bug, 'steps'); if($setImgSize) $bug->steps = $this->file->setImgSize($bug->steps); foreach($bug as $key => $value) if(strpos($key, 'Date') !== false and !(int)substr($value, 0, 4)) $bug->$key = ''; diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index c0eda594be..6c0bf203ad 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -105,7 +105,7 @@
@@ -239,9 +239,15 @@
+ systemMode == 'new'):?> + + + + + - +
bug->project;?>project) echo html::a($this->createLink('project', 'view', "projectID=$bug->project"), $bug->projectName);?>
bug->execution;?>execution) echo html::a($this->createLink('execution', 'browse', "executionid=$bug->execution"), $bug->executionName);?>execution) echo html::a($this->createLink('execution', 'browse', "executionID=$bug->execution"), $bug->executionName);?>
bug->story;?>