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

fixbug_23768

Browse Source
This commit is contained in:
sunjun
2022-06-30 09:26:19 +00:00
parent c0a04777e5
commit 183b1a716b
7 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/config.php
+9 -1
View File
@@ -75,6 +75,7 @@ $config->testcase->search['params']['lastRunDate'] = array('operator' => '=',
$config->testcase->search['params']['openedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->testcase->search['params']['lastEditedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
global $app;
$config->testcase->datatable = new stdclass();
$config->testcase->datatable->defaultField = array('id', 'pri', 'title', 'type', 'openedBy', 'lastRunner', 'lastRunDate', 'lastRunResult', 'status', 'bugs', 'results', 'stepNumber', 'actions');
@@ -159,7 +160,14 @@ $config->testcase->datatable->fieldList['lastRunResult']['fixed'] = 'no';
$config->testcase->datatable->fieldList['lastRunResult']['width'] = '70';
$config->testcase->datatable->fieldList['lastRunResult']['required'] = 'no';
$config->testcase->datatable->fieldList['status']['title'] = 'statusAB';
if($app->rawMethod == 'cases')
{
$config->testcase->datatable->fieldList['status']['title'] = 'executionStatus';
}
else
{
$config->testcase->datatable->fieldList['status']['title'] = 'statusAB';
}
$config->testcase->datatable->fieldList['status']['fixed'] = 'no';
$config->testcase->datatable->fieldList['status']['width'] = '70';
$config->testcase->datatable->fieldList['status']['required'] = 'no';
module/testcase/lang/de.php
+1 -1
View File
@@ -94,7 +94,7 @@ $lang->testcase->mailto = 'Mailto';
$lang->testcase->deleted = 'Deleted';
$lang->testcase->browseUnits = 'Unit Test';
$lang->testcase->suite = 'Test Suite';
$lang->testcase->lib = 'Lib';
$lang->testcase->executionStatus = 'executionStatus';
$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.
module/testcase/lang/en.php
+1 -1
View File
@@ -94,7 +94,7 @@ $lang->testcase->mailto = 'Mailto';
$lang->testcase->deleted = 'Deleted';
$lang->testcase->browseUnits = 'Unit Test';
$lang->testcase->suite = 'Test Suite';
$lang->testcase->lib = 'Lib';
$lang->testcase->executionStatus = 'executionStatus';
$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.
module/testcase/lang/fr.php
+1 -1
View File
@@ -94,7 +94,7 @@ $lang->testcase->mailto = 'Mailto';
$lang->testcase->deleted = 'Deleted';
$lang->testcase->browseUnits = 'Unit Test';
$lang->testcase->suite = 'Test Suite';
$lang->testcase->lib = 'Lib';
$lang->testcase->executionStatus = 'executionStatus';
$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.
module/testcase/lang/zh-cn.php
+1 -1
View File
@@ -94,7 +94,7 @@ $lang->testcase->mailto = '抄送给';
$lang->testcase->deleted = '是否删除';
$lang->testcase->browseUnits = '单元测试';
$lang->testcase->suite = '套件';
$lang->testcase->lib = '用例库';
$lang->testcase->executionStatus = '执行状态';
$lang->case = $lang->testcase; // 用于DAO检查时使用。因为case是系统关键字，所以无法定义该模块为case，只能使用testcase，但表还是使用的case。
module/testcase/model.php
+1 -1
View File
@@ -1670,7 +1670,7 @@ class testcaseModel extends model
$caseIdList = explode(',' , $caseIdList);
$libID = $this->post->lib;
if(empty($libID)) return dao::$errors[] = sprintf($this->lang->error->notempty, $this->lang->testcase->lib);
if(empty($libID)) return dao::$errors[] = sprintf($this->lang->error->notempty, $this->lang->testcase->caselib);
$this->loadModel('action');
$cases = $this->dao->select('*')->from(TABLE_CASE)->where('deleted')->eq(0)->andWhere('id')->in($caseIdList)->fetchAll('id');