From a20f6c9ce0e39790adf60ea9feb0d66033623add Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 19 Apr 2016 11:12:56 +0800 Subject: [PATCH] * fix bug and adjust code for get story version when batch create case. --- module/testcase/model.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/module/testcase/model.php b/module/testcase/model.php index 469bb2a0e6..28094d8c79 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -117,6 +117,8 @@ class testcaseModel extends model $cases->pri[$i] = $pri; } + $this->loadModel('story'); + $storyVersions = array(); for($i = 0; $i < $batchNum; $i++) { if($cases->type[$i] != '' and $cases->title[$i] != '') @@ -136,13 +138,13 @@ class testcaseModel extends model $data[$i]->openedDate = $now; $data[$i]->status = 'normal'; $data[$i]->version = 1; - if(!$data[$i]->story) + + $caseStory = $data[$i]->story; + $data[$i]->storyVersion = isset($storyVersions[$caseStory]) ? $storyVersions[$caseStory] : 0; + if($caseStory and !isset($storyVersions[$caseStory])) { - $data[$i]->story = 0; - } - else - { - $data[$i]->storyVersion = $this->loadModel('story')->getVersion($this->post->story); + $data[$i]->storyVersion = $this->story->getVersion($caseStory); + $storyVersions[$caseStory] = $data[$i]->storyVersion; } $this->dao->insert(TABLE_CASE)->data($data[$i])