diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index 9ac585f2d2..06ecf411f2 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -41,6 +41,8 @@ $lang->testcase->stage = 'Stage'; $lang->testcase->lastEditedByAB = 'Last edited by'; $lang->testcase->lastEditedDateAB = 'Last edited date'; $lang->testcase->allProduct = 'All product'; +$lang->testcase->fromBug = 'From bug'; +$lang->testcase->toBug = 'To bug'; $lang->case = $lang->testcase; // For dao checking using. Because 'case' is a php keywords, so the module name is testcase, table name is still case. $lang->testcase->stepID = 'ID'; diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php index abb5106b66..e3d56aedf3 100644 --- a/module/testcase/lang/zh-cn.php +++ b/module/testcase/lang/zh-cn.php @@ -41,6 +41,8 @@ $lang->testcase->stage = '适用阶段'; $lang->testcase->lastEditedByAB = '修改者'; $lang->testcase->lastEditedDateAB = '修改日期'; $lang->testcase->allProduct = '所有产品'; +$lang->testcase->fromBug = '来源Bug'; +$lang->testcase->toBug = '生成Bug'; $lang->case = $lang->testcase; // 用于DAO检查时使用。因为case是系统关键字,所以无法定义该模块为case,只能使用testcase,但表还是使用的case。 $lang->testcase->stepID = '编号'; diff --git a/module/testcase/model.php b/module/testcase/model.php index 3854a2d095..a4ddf186fe 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -160,6 +160,19 @@ class testcaseModel extends model $case->storyStatus = $story->status; $case->latestStoryVersion = $story->version; } + + /* Get fromBugName and toBugs. */ + $case->fromBugName = ''; + $case->toBugs = array(); + + if($case->fromBug) + { + $bug = $this->dao->findById($case->fromBug)->from(TABLE_BUG)->fields('title')->fetch(); + $case->fromBugName = $bug->title; + } + $toBugs = $this->dao->select('id, title')->from(TABLE_BUG)->where('`case`')->eq($caseID)->fetchAll(); + foreach($toBugs as $toBug) $case->toBugs[$toBug->id] = $toBug->title; + if($case->linkCase) $case->linkCaseTitles = $this->dao->select('id,title')->from(TABLE_CASE)->where('id')->in($case->linkCase)->fetchPairs(); if($version == 0) $version = $case->version; $case->steps = $this->dao->select('*')->from(TABLE_CASESTEP)->where('`case`')->eq($caseID)->andWhere('version')->eq($version)->orderBy('id')->fetchAll(); diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php index 3ce4424ef8..53693aa778 100644 --- a/module/testcase/view/view.html.php +++ b/module/testcase/view/view.html.php @@ -182,6 +182,27 @@ +
+ testcase->legendLinkBugs;?> + + + + + + + + + +
testcase->fromBug;?>createLink('bug', 'view', "bugID=$case->fromBug"), $case->fromBugName);?>
testcase->toBug;?> + toBugs as $bugID => $bug) + { + echo '

' . html::a($this->createLink('bug', 'view', "bugID=$bugID"), $bug) . '

'; + } + ?> +
+
+
testcase->legendOpenAndEdit;?>