From 183b1a716bc9ec397cea35d36939c99d7816fce5 Mon Sep 17 00:00:00 2001 From: sunjun Date: Thu, 30 Jun 2022 09:26:19 +0000 Subject: [PATCH] fixbug_23768 --- module/datatable/control.php | 2 ++ module/testcase/config.php | 10 +++++++++- module/testcase/lang/de.php | 2 +- module/testcase/lang/en.php | 2 +- module/testcase/lang/fr.php | 2 +- module/testcase/lang/zh-cn.php | 2 +- module/testcase/model.php | 2 +- 7 files changed, 16 insertions(+), 6 deletions(-) diff --git a/module/datatable/control.php b/module/datatable/control.php index f365b7e8b1..1f2ba3a0c1 100644 --- a/module/datatable/control.php +++ b/module/datatable/control.php @@ -67,6 +67,8 @@ class datatable extends control $this->app->loadConfig('testtask'); $this->config->testcase->datatable->defaultField = $this->config->testtask->datatable->defaultField; $this->config->testcase->datatable->fieldList['actions']['width'] = '100'; + $this->config->testcase->datatable->fieldList['status']['title'] = $this->lang->testcase->executionStatus; + $this->config->testcase->datatable->fieldList['status']['width'] = '90'; } if($module == 'testcase') { diff --git a/module/testcase/config.php b/module/testcase/config.php index 2bae8f5cec..486e5aeecf 100644 --- a/module/testcase/config.php +++ b/module/testcase/config.php @@ -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'; diff --git a/module/testcase/lang/de.php b/module/testcase/lang/de.php index 75a624b4fc..a9091726da 100644 --- a/module/testcase/lang/de.php +++ b/module/testcase/lang/de.php @@ -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. diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index 9bb76c9391..33fa088e2a 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -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. diff --git a/module/testcase/lang/fr.php b/module/testcase/lang/fr.php index 7e57f446e8..1e36412913 100644 --- a/module/testcase/lang/fr.php +++ b/module/testcase/lang/fr.php @@ -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. diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php index c439aa93be..779e22aab7 100644 --- a/module/testcase/lang/zh-cn.php +++ b/module/testcase/lang/zh-cn.php @@ -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。 diff --git a/module/testcase/model.php b/module/testcase/model.php index 90c8d2e501..169ab985b3 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -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');