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

* adjust code.

Browse Source
This commit is contained in:
wangyidong
2017-03-21 15:06:38 +08:00
parent a6c7eed490
commit dc812fd161
41 changed files with 181 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/model.php
+8 -11
View File
@@ -714,9 +714,6 @@ class testcaseModel extends model
$data = fixer::input('post')->get();
$caseIDList = $this->post->caseIDList;
/* Adjust whether the post data is complete, if not, remove the last element of $caseIDList. */
if($this->session->showSuhosinInfo) array_pop($caseIDList);
/* Process data if the value is 'ditto'. */
foreach($caseIDList as $caseID)
{
@@ -995,16 +992,16 @@ class testcaseModel extends model
{
$step = (array)$step;
if(empty($step['desc'])) continue;
$isGroup = $step['type'] == 'group';
$stepData = new stdclass();
$stepData->parent = $isGroup ? 0 : $parentStepID;
$stepData->type = ($step['type'] == 'item' and $parentStepID == 0) ? 'step' : $step['type'];
$stepData->parent = ($stepData->type == 'item') ? $parentStepID : 0;
$stepData->case = $caseID;
$stepData->version = $version;
$stepData->type = $step['type'];
$stepData->desc = htmlspecialchars($step['desc']);
$stepData->expect = htmlspecialchars($step['expect']);
$this->dao->insert(TABLE_CASESTEP)->data($stepData)->autoCheck()->exec();
if($isGroup) $parentStepID = $this->dao->lastInsertID();
if($stepData->type == 'group') $parentStepID = $this->dao->lastInsertID();
if($stepData->type == 'step') $parentStepID = 0;
}
}
$oldCase->steps = $this->joinStep($oldStep);
@@ -1031,16 +1028,16 @@ class testcaseModel extends model
{
$desc = trim($desc);
if(empty($desc)) continue;
$isGroup = $data->stepType[$key][$id] == 'group';
$stepData = new stdclass();
$stepData->parent = $isGroup ? 0 : $parentStepID;
$stepData->type = ($data->stepType[$key][$id] == 'item' and $parentStepID == 0) ? 'step' : $data->stepType[$key][$id];
$stepData->parent = ($stepData->type == 'item') ? $parentStepID : 0;
$stepData->case = $caseID;
$stepData->version = 1;
$stepData->type = $isGroup ? 'group' : 'item';
$stepData->desc = htmlspecialchars($desc);
$stepData->expect = htmlspecialchars($data->expect[$key][$id]);
$this->dao->insert(TABLE_CASESTEP)->data($stepData)->autoCheck()->exec();
if($isGroup) $parentStepID = $this->dao->lastInsertID();
if($stepData->type == 'group') $parentStepID = $this->dao->lastInsertID();
if($stepData->type == 'step') $parentStepID = 0;
}
$this->action->create('case', $caseID, 'Opened');
}