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

* Finish task #53549.

Browse Source
This commit is contained in:
daitingting
2022-05-09 06:41:35 +00:00
parent 73dce33bc3
commit 96e460c47d
14 changed files with 76 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/model.php
+5 -7
View File
@@ -64,7 +64,7 @@ class testcaseModel extends model
/* Value of story may be showmore. */
$case->story = (int)$case->story;
$this->dao->insert(TABLE_CASE)->data($case)->autoCheck()->batchCheck($this->config->testcase->create->requiredFields, 'notempty')->exec();
$this->dao->insert(TABLE_CASE)->data($case)->autoCheck()->batchCheck($this->config->testcase->create->requiredFields, 'notempty')->checkFlow()->exec();
if(!$this->dao->isError())
{
$caseID = $this->dao->lastInsertID();
@@ -174,8 +174,6 @@ class testcaseModel extends model
if(is_array($data[$i]->{$extendField->field})) $data[$i]->{$extendField->field} = join(',', $data[$i]->{$extendField->field});
$data[$i]->{$extendField->field} = htmlSpecialString($data[$i]->{$extendField->field});
$message = $this->checkFlowRule($extendField, $data[$i]->{$extendField->field});
if($message) return print(js::alert($message));
}
foreach(explode(',', $this->config->testcase->create->requiredFields) as $field)
@@ -191,6 +189,7 @@ class testcaseModel extends model
$this->dao->insert(TABLE_CASE)->data($case)
->autoCheck()
->batchCheck($this->config->testcase->create->requiredFields, 'notempty')
->checkFlow()
->exec();
if(dao::isError())
@@ -737,7 +736,7 @@ class testcaseModel extends model
array_splice($requiredFieldsArr, $fieldIndex, 1);
$requiredFields = implode(',', $requiredFieldsArr);
}
$this->dao->update(TABLE_CASE)->data($case)->autoCheck()->batchCheck($requiredFields, 'notempty')->where('id')->eq((int)$caseID)->exec();
$this->dao->update(TABLE_CASE)->data($case)->autoCheck()->batchCheck($requiredFields, 'notempty')->checkFlow()->where('id')->eq((int)$caseID)->exec();
if(!$this->dao->isError())
{
$isLibCase = ($oldCase->lib and empty($oldCase->product));
@@ -843,7 +842,7 @@ class testcaseModel extends model
->join('reviewedBy', ',')
->get();
$this->dao->update(TABLE_CASE)->data($case)->autoCheck()->where('id')->eq($caseID)->exec();
$this->dao->update(TABLE_CASE)->data($case)->autoCheck()->checkFlow()->where('id')->eq($caseID)->exec();
if(dao::isError()) return false;
@@ -967,8 +966,6 @@ class testcaseModel extends model
if(is_array($case->{$extendField->field})) $case->{$extendField->field} = join(',', $case->{$extendField->field});
$case->{$extendField->field} = htmlSpecialString($case->{$extendField->field});
$message = $this->checkFlowRule($extendField, $case->{$extendField->field});
if($message) return print(js::alert($message));
}
$cases[$caseID] = $case;
@@ -983,6 +980,7 @@ class testcaseModel extends model
$this->dao->update(TABLE_CASE)->data($case)
->autoCheck()
->batchCheck($this->config->testcase->edit->requiredFields, 'notempty')
->checkFlow()
->where('id')->eq($caseID)
->exec();