Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

+ finish task#571

Browse Source
This commit is contained in:
chencongzhi520@gmail.com
2011-10-15 05:50:21 +00:00
parent 1e47053b7a
commit 0adda2f7d7
3 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/lang/zh-cn.php
+1
View File
@@ -134,6 +134,7 @@ $lang->bug->buttonActivate = '激活';
$lang->bug->buttonResolve = '解决';
$lang->bug->buttonClose = '关闭';
$lang->bug->buttonToList = '返回';
$lang->bug->buttonConvertToTestcase = '转为用例';
/* 交互提示。*/
$lang->bug->confirmChangeProduct = '修改产品会导致相应的项目、需求和任务发生变化，确定吗？';
module/bug/view/view.html.php
+5 -3
View File
@@ -15,9 +15,10 @@
<div id='main' <?php if($bug->deleted) echo "class='deleted'";?>>BUG #<?php echo $bug->id . $lang->colon . $bug->title;?></div>
<div>
<?php
$browseLink = $app->session->bugList != false ? $app->session->bugList : inlink('browse', "productID=$bug->product");
$params = "bugID=$bug->id";
$copyParams = "productID=$productID&extra=bugID=$bug->id";
$browseLink = $app->session->bugList != false ? $app->session->bugList : inlink('browse', "productID=$bug->product");
$params = "bugID=$bug->id";
$copyParams = "productID=$productID&extras=bugID=$bug->id";
$convertParams = "productID=$productID&moduleID=0&testcaseID=0&extras=bugID=$bug->id";
if(!$bug->deleted)
{
if(!($bug->status == 'active' and $bug->confirm == 0 and common::printLink('bug', 'confirmBug', $params, $lang->bug->buttonConfirm))) echo $lang->bug->buttonConfirm . ' ';
@@ -26,6 +27,7 @@
if(!($bug->status == 'resolved' and common::printLink('bug', 'close', $params, $lang->bug->buttonClose))) echo $lang->bug->buttonClose . ' ';
if(!(($bug->status == 'closed' or $bug->status == 'resolved') and common::printLink('bug', 'activate', $params, $lang->bug->buttonActivate))) echo $lang->bug->buttonActivate . ' ';
common::printLink('bug', 'create', $copyParams, $lang->bug->buttonCopy);
common::printLink('testcase', 'create', $convertParams, $lang->bug->buttonConvertToTestcase);
common::printLink('bug', 'delete', $params, $lang->delete, 'hiddenwin');
}
echo html::a($browseLink, $lang->goback);
module/testcase/control.php
+19 -1
View File
@@ -153,10 +153,11 @@ class testcase extends control
* @param int $productID
* @param int $moduleID
* @param int $testcaseID
* @param string $extras others params, forexample, bugID=10
* @access public
* @return void
*/
public function create($productID, $moduleID = 0, $testcaseID = 0)
public function create($productID, $moduleID = 0, $testcaseID = 0, $extras = '')
{
$this->loadModel('story');
if(!empty($_POST))
@@ -197,7 +198,24 @@ class testcase extends control
$keywords = $testcase->keywords;
$steps = $testcase->steps;
}
/* Parse the extras. */
$extras = str_replace(array(',', ' '), array('&', ''), $extras);
parse_str($extras);
/* If bugID setted, use this bug as template. */
if(isset($bugID))
{
$bug = $this->loadModel('bug')->getById($bugID);
$type = $bug->type;
$pri = $bug->severity;
$storyID = $bug->story;
$title = $bug->title;
$keywords = $bug->keywords;
$steps[] = (object)array('desc'=>strip_tags($bug->steps), 'expect'=>'');
}
/* Padding the steps to the default steps count. */
if(count($steps) < $this->config->testcase->defaultSteps)
{