From 64c012b3e58caa8b0a2532eede5abd23e47586f7 Mon Sep 17 00:00:00 2001 From: wangchunsheng Date: Sat, 7 Aug 2010 02:12:20 +0000 Subject: [PATCH] * fix the bug of 1.2. --- module/bug/lang/en.php | 6 +++--- module/bug/lang/zh-cn.php | 6 +++--- module/bug/lang/zh-tw.php | 6 +++--- module/bug/model.php | 6 +++--- module/bug/view/create.html.php | 2 +- module/bug/view/edit.html.php | 5 +++-- module/build/control.php | 6 +++--- module/build/model.php | 2 +- 8 files changed, 20 insertions(+), 19 deletions(-) diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index 20723dbe98..dde43ee919 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -142,9 +142,9 @@ $lang->bug->confirmDelete = 'Are you sure to delete this bug?'; $lang->bug->setTemplateTitle = 'Please input the template title:'; /* 模板。*/ -$lang->bug->tplStep = "[b][Steps][/b]\n\n"; -$lang->bug->tplResult = "[b][Result][/b]\n\n"; -$lang->bug->tplExpect = "[b][Expect][/b]\n\n"; +$lang->bug->tplStep = "[Steps]\n\n"; +$lang->bug->tplResult = "[Result]\n\n"; +$lang->bug->tplExpect = "[Expect]\n\n"; /* 各个字段取值列表。*/ $lang->bug->severityList[3] = '3'; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index c970e64e2c..f6225da4ee 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -142,9 +142,9 @@ $lang->bug->confirmDelete = '您确认要删除该Bug吗？'; $lang->bug->setTemplateTitle = '请输入bug模板标题（保存之前请先填写bug重现步骤）：'; /* 模板。*/ -$lang->bug->tplStep = "[b][步骤][/b]\n\n"; -$lang->bug->tplResult = "[b][结果][/b]\n\n"; -$lang->bug->tplExpect = "[b][期望][/b]\n\n"; +$lang->bug->tplStep = "[步骤]\n\n"; +$lang->bug->tplResult = "[结果]\n\n"; +$lang->bug->tplExpect = "[期望]\n\n"; /* 各个字段取值列表。*/ $lang->bug->severityList[3] = '3'; diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php index 6ba787b880..5f0f8de0cf 100644 --- a/module/bug/lang/zh-tw.php +++ b/module/bug/lang/zh-tw.php @@ -142,9 +142,9 @@ $lang->bug->confirmDelete = '您確認要刪除該Bug嗎？'; $lang->bug->setTemplateTitle = '請輸入bug模板標題（保存之前請先填寫bug重現步驟）：'; /* 模板。*/ -$lang->bug->tplStep = "[b][步驟][/b]\n\n"; -$lang->bug->tplResult = "[b][結果][/b]\n\n"; -$lang->bug->tplExpect = "[b][期望][/b]\n\n"; +$lang->bug->tplStep = "[步驟]\n\n"; +$lang->bug->tplResult = "[結果]\n\n"; +$lang->bug->tplExpect = "[期望]\n\n"; /* 各個欄位取值列表。*/ $lang->bug->severityList[3] = '3'; diff --git a/module/bug/model.php b/module/bug/model.php index b7c8ed7853..bdae0cbc99 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -280,15 +280,15 @@ class bugModel extends model $title = $run->case->title; $caseSteps = $run->case->steps; $stepResults = unserialize($result->stepResults); - $bugSteps = $this->lang->bug->tblStep; + $bugSteps = $this->lang->bug->tplStep; foreach($caseSteps as $key => $step) { $bugSteps .= ($key + 1) . '. ' .$step->desc . "\n"; if($stepResults[$step->id]['result'] == 'fail') { - $bugSteps .= $this->lang->bug->tblResult; + $bugSteps .= $this->lang->bug->tplResult; $bugSteps .= $stepResults[$step->id]['real'] . "\n"; - $bugSteps .= $this->lang->bug->tblExpect; + $bugSteps .= $this->lang->bug->tplExpect; $bugSteps .= $step->expect; break; } diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php index a611ba80c6..fc8497ccf4 100644 --- a/module/bug/view/create.html.php +++ b/module/bug/view/create.html.php @@ -119,7 +119,7 @@ function setAssignedTo() /* 加载项目的build列表。*/ function loadProjectBuilds(projectID) { - link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&varName=openedBuild'); + link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + $('#product').val() + '&varName=openedBuild'); $('#buildBox').load(link); } var userList = "".split(','); diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php index 0a8053b98c..b423d71c7e 100644 --- a/module/bug/view/edit.html.php +++ b/module/bug/view/edit.html.php @@ -122,9 +122,10 @@ function loadProjectStories(projectID) /* 加载项目的build列表。*/ function loadProjectBuilds(projectID) { - link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&varName=openedBuild&build=' + oldOpenedBuild); + productID = $('#product').val(); + link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + productID + '&varName=openedBuild&build=' + oldOpenedBuild); $('#openedBuildBox').load(link); - link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&varName=resolvedBuild&build=' + oldResolvedBuild); + link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + productID + '&varName=resolvedBuild&build=' + oldResolvedBuild); $('#resolvedBuildBox').load(link); } diff --git a/module/build/control.php b/module/build/control.php index 04337fdd41..ea113c99af 100644 --- a/module/build/control.php +++ b/module/build/control.php @@ -114,9 +114,9 @@ class build extends control } /* AJAX接口：获得项目的build列表。*/ - public function ajaxGetProjectBuilds($projectID, $varName, $build = '') + public function ajaxGetProjectBuilds($projectID, $productID, $varName, $build = '') { - if($varName == 'openedBuild') die(html::select($varName . '[]', $this->build->getProjectBuildPairs($projectID, 'noempty'), $build, 'size=4 class=select-3 multiple')); - if($varName == 'resolvedBuild') die(html::select($varName, $this->build->getProjectBuildPairs($projectID, 'noempty'), $build, 'class=select-3')); + if($varName == 'openedBuild') die(html::select($varName . '[]', $this->build->getProjectBuildPairs($projectID, $productID, 'noempty'), $build, 'size=4 class=select-3 multiple')); + if($varName == 'resolvedBuild') die(html::select($varName, $this->build->getProjectBuildPairs($projectID, $productID, 'noempty'), $build, 'class=select-3')); } } diff --git a/module/build/model.php b/module/build/model.php index ed7eaccb1f..7e81d23417 100644 --- a/module/build/model.php +++ b/module/build/model.php @@ -59,7 +59,7 @@ class buildModel extends model $builds = $this->dao->select('id,name')->from(TABLE_BUILD) ->where('project')->eq((int)$projectID) - ->andWhere('product')->eq((int)$productID) + ->beginIF($productID)->andWhere('product')->eq((int)$productID)->fi() ->andWhere('deleted')->eq(0) ->orderBy('id desc')->fetchPairs(); if(!$builds) return $sysBuilds;