fixbug_24544
This commit is contained in:
@@ -2172,6 +2172,7 @@ class testcase extends control
|
||||
if(!empty($_POST))
|
||||
{
|
||||
$this->testcase->importToLib($caseID);
|
||||
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
|
||||
if(!empty($caseID)) return $this->send(array('result' => 'success', 'message' => $this->lang->importSuccess, 'closeModal' => true,));
|
||||
return $this->send(array('result' => 'success', 'message' => $this->lang->importSuccess, 'locate' => 'reload'));
|
||||
}
|
||||
|
||||
@@ -94,6 +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->case = $lang->testcase; // For dao checking using. Because 'case' is a php keywords, so the module name is testcase, table name is still case.
|
||||
|
||||
|
||||
@@ -94,6 +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->case = $lang->testcase; // For dao checking using. Because 'case' is a php keywords, so the module name is testcase, table name is still case.
|
||||
|
||||
|
||||
@@ -94,6 +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->case = $lang->testcase; // For dao checking using. Because 'case' is a php keywords, so the module name is testcase, table name is still case.
|
||||
|
||||
|
||||
@@ -94,6 +94,7 @@ $lang->testcase->mailto = '抄送给';
|
||||
$lang->testcase->deleted = '是否删除';
|
||||
$lang->testcase->browseUnits = '单元测试';
|
||||
$lang->testcase->suite = '套件';
|
||||
$lang->testcase->lib = '用例库';
|
||||
|
||||
$lang->case = $lang->testcase; // 用于DAO检查时使用。因为case是系统关键字,所以无法定义该模块为case,只能使用testcase,但表还是使用的case。
|
||||
|
||||
|
||||
@@ -1670,8 +1670,9 @@ class testcaseModel extends model
|
||||
$caseIdList = explode(',' , $caseIdList);
|
||||
$libID = $this->post->lib;
|
||||
|
||||
$this->loadModel('action');
|
||||
if(empty($libID)) return dao::$errors[] = sprintf($this->lang->error->notempty, $this->lang->testcase->lib);
|
||||
|
||||
$this->loadModel('action');
|
||||
$cases = $this->dao->select('*')->from(TABLE_CASE)->where('deleted')->eq(0)->andWhere('id')->in($caseIdList)->fetchAll('id');
|
||||
$caseSteps = $this->dao->select('*')->from(TABLE_CASESTEP)->where('`case`')->in($caseIdList)->orderBy('id')->fetchGroup('case');
|
||||
$caseFiles = $this->dao->select('*')->from(TABLE_FILE)->where('objectID')->in($caseIdList)->andWhere('objectType')->eq('testcase')->fetchGroup('objectID', 'id');
|
||||
|
||||
Reference in New Issue
Block a user