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

* code for task#1598.

Browse Source
This commit is contained in:
xia0ta0
2013-07-25 09:09:36 +08:00
parent 2d4a058478
commit bf33420c03
9 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/lang/en.php
+1
View File
@@ -77,6 +77,7 @@ $lang->action->desc->commented = '$date, commented by <strong>$actor</stron
$lang->action->desc->activated = '$date, activated by <strong>$actor</strong>.';
$lang->action->desc->moved = '$date, moved by <strong>$actor</strong>, previouse is "$extra".';
$lang->action->desc->confirmed = '$date, confirmed by <strong>$actor</strong>, version is<strong>#$extra</strong>.';
$lang->action->desc->caseconfirmed = '$date, confirmed by <strong>$actor</strong>, version is<strong>#$extra</strong>.';
$lang->action->desc->bugconfirmed = '$date, confirmed by <strong>$actor</strong>.';
$lang->action->desc->frombug = '$date, from Bug by <strong>$actor</strong> BugID:<strong>$extra</strong>.';
$lang->action->desc->started = '$date, started by <strong>$actor</strong>.';
module/action/lang/zh-cn.php
+1
View File
@@ -77,6 +77,7 @@ $lang->action->desc->commented = '$date, 由 <strong>$actor</strong> 添加
$lang->action->desc->activated = '$date, 由 <strong>$actor</strong> 激活。' . "\n";
$lang->action->desc->moved = '$date, 由 <strong>$actor</strong> 移动，之前为 "$extra"。' . "\n";
$lang->action->desc->confirmed = '$date, 由 <strong>$actor</strong> 确认需求变动，最新版本为<strong>#$extra</strong>。' . "\n";
$lang->action->desc->caseconfirmed = '$date, 由 <strong>$actor</strong> 确认用例变动，最新版本为<strong>#$extra</strong>。' . "\n";
$lang->action->desc->bugconfirmed = '$date, 由 <strong>$actor</strong> 确认Bug。' . "\n";
$lang->action->desc->frombug = '$date, 由 <strong>$actor</strong> Bug转化而来，Bug编号为 <strong>$extra</strong>。';
$lang->action->desc->started = '$date, 由 <strong>$actor</strong> 启动。' . "\n";
module/group/lang/resource.php
+3 -1
View File
@@ -392,6 +392,7 @@ $lang->resource->testcase->edit = 'edit';
$lang->resource->testcase->batchEdit = 'batchEdit';
$lang->resource->testcase->delete = 'delete';
$lang->resource->testcase->export = 'export';
$lang->resource->testcase->confirmChange = 'confirmChange';
$lang->resource->testcase->confirmStoryChange = 'confirmStoryChange';
$lang->testcase->methodOrder[0] = 'index';
@@ -402,7 +403,8 @@ $lang->testcase->methodOrder[20] = 'view';
$lang->testcase->methodOrder[25] = 'edit';
$lang->testcase->methodOrder[30] = 'delete';
$lang->testcase->methodOrder[35] = 'export';
$lang->testcase->methodOrder[40] = 'confirmStoryChange';
$lang->testcase->methodOrder[40] = 'confirmChange';
$lang->testcase->methodOrder[45] = 'confirmStoryChange';
/* Test task. */
$lang->resource->testtask = new stdclass();
module/testcase/control.php
+15
View File
@@ -500,6 +500,21 @@ class testcase extends control
}
}
/**
* Confirm testcase changed.
*
* @param int $caseID
* @access public
* @return void
*/
public function confirmChange($caseID)
{
$case = $this->testcase->getById($caseID);
$this->dao->update(TABLE_TESTRUN)->set('version')->eq($case->version)->where('`case`')->eq($caseID)->exec();
$this->loadModel('action')->create('case', $caseID, 'caseconfirmed', '', $case->version);
die(js::locate(inLink('view', "caseID=$caseID"), 'parent'));
}
/**
* Confirm story changes.
*
module/testcase/lang/en.php
+3
View File
@@ -43,6 +43,7 @@ $lang->testcase->lastEditedDateAB = 'Last edited date';
$lang->testcase->allProduct = 'All product';
$lang->testcase->fromBug = 'From bug';
$lang->testcase->toBug = 'To bug';
$lang->testcase->changed = 'Changed';
$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';
@@ -62,6 +63,8 @@ $lang->testcase->browse = "Browse";
$lang->testcase->import = "Import";
$lang->testcase->exportTemplet = "Export templet";
$lang->testcase->export = "Export";
$lang->testcase->export = "Export";
$lang->testcase->confirmChange = 'Confirm case change';
$lang->testcase->confirmStoryChange = 'Confirm story change';
$lang->testcase->deleteStep = 'Delete';
module/testcase/lang/zh-cn.php
+2
View File
@@ -43,6 +43,7 @@ $lang->testcase->lastEditedDateAB = '修改日期';
$lang->testcase->allProduct = '所有产品';
$lang->testcase->fromBug = '来源Bug';
$lang->testcase->toBug = '生成Bug';
$lang->testcase->changed = '用例变更';
$lang->case = $lang->testcase; // 用于DAO检查时使用。因为case是系统关键字，所以无法定义该模块为case，只能使用testcase，但表还是使用的case。
$lang->testcase->stepID = '编号';
@@ -62,6 +63,7 @@ $lang->testcase->browse = "用例列表";
$lang->testcase->import = "导入用例";
$lang->testcase->exportTemplet = "导出模板";
$lang->testcase->export = "导出";
$lang->testcase->confirmChange = '确认用例变动';
$lang->testcase->confirmStoryChange = '确认需求变动';
$lang->testcase->deleteStep = '删除';
module/testcase/view/view.html.php
+11 -1
View File
@@ -171,7 +171,17 @@
</tr>
<tr>
<td class='rowhead'><?php echo $lang->testcase->status;?></td>
<td><?php echo $lang->testcase->statusList[$case->status];?></td>
<td>
<?php
echo $lang->testcase->statusList[$case->status];
if($case->version > $case->currentVersion)
{
echo " (<span class='warning'>{$lang->testcase->changed}</span> ";
echo html::a($this->createLink('testcase', 'confirmchange', "caseID=$case->id"), $lang->confirm, 'hiddenwin');
echo ")";
}
?>
</td>
</tr>
<tr>
<td class='rowhead'><?php echo $this->app->loadLang('testtask')->testtask->lastRunTime;?></td>
module/testtask/model.php
+2 -2
View File
@@ -224,7 +224,7 @@ class testtaskModel extends model
{
$orderBy = strpos($orderBy, 'assignedTo') !== false ? ('t1.' . $orderBy) : ('t2.' . $orderBy);
return $this->dao->select('t2.*,t1.*')->from(TABLE_TESTRUN)->alias('t1')
return $this->dao->select('t2.*,t1.*,t2.version as caseVersion')->from(TABLE_TESTRUN)->alias('t1')
->leftJoin(TABLE_CASE)->alias('t2')->on('t1.case = t2.id')
->where('t1.task')->eq((int)$taskID)
->beginIF($moduleID)->andWhere('t2.module')->in($moduleID)->fi()
@@ -246,7 +246,7 @@ class testtaskModel extends model
{
$orderBy = strpos($orderBy, 'assignedTo') !== false ? ('t1.' . $orderBy) : ('t2.' . $orderBy);
return $this->dao->select('t2.*,t1.*')->from(TABLE_TESTRUN)->alias('t1')
return $this->dao->select('t2.*,t1.*,t2.version as caseVersion')->from(TABLE_TESTRUN)->alias('t1')
->leftJoin(TABLE_CASE)->alias('t2')->on('t1.case = t2.id')
->where('t1.task')->eq((int)$taskID)
->andWhere('t1.assignedTo')->eq($user)
module/testtask/view/cases.html.php
+1 -1
View File
@@ -83,7 +83,7 @@ var moduleID = '<?php echo $moduleID;?>';
<td><?php $lastRunner = $users[$run->lastRunner]; echo substr($lastRunner, strpos($lastRunner, ':') + 1);?></td>
<td><?php if(!helper::isZeroDate($run->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($run->lastRunDate));?></td>
<td class='<?php echo $run->lastRunResult;?>'><?php if($run->lastRunResult) echo $lang->testcase->resultList[$run->lastRunResult];?></td>
<td class='<?php echo $run->status;?>'><?php echo $lang->testtask->statusList[$run->status];?></td>
<td class='<?php echo $run->status;?>'><?php echo ($run->version < $run->caseVersion) ? "<span class='warning'>{$lang->testcase->changed}</span>" : $lang->testtask->statusList[$run->status];?></td>
<td class='a-center'>
<?php
common::printIcon('testtask', 'runCase', "id=$run->id", '', 'list', '', '', 'iframe');