From 4a49230495c8d705a5257cde72a8c95a38490eaa Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 5 Sep 2018 12:08:52 +0800 Subject: [PATCH] * finish task #4807. --- module/bug/model.php | 7 +++---- module/story/model.php | 7 +++---- module/task/model.php | 3 +-- module/testcase/model.php | 11 +++++------ module/testcase/view/batchcreate.html.php | 4 ++-- 5 files changed, 14 insertions(+), 18 deletions(-) diff --git a/module/bug/model.php b/module/bug/model.php index 673e112d80..7e7cf40bce 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -184,7 +184,6 @@ class bugModel extends model $now = helper::now(); $actions = array(); $data = fixer::input('post')->get(); - $batchNum = count(reset($data)); $result = $this->loadModel('common')->removeDuplicate('bug', $data, "product={$productID}"); $data = $result['data']; @@ -200,7 +199,7 @@ class bugModel extends model $pri = 0; $os = ''; $browser = ''; - for($i = 0; $i < $batchNum; $i++) + foreach($data->title as $i => $title) { if($data->modules[$i] != 'ditto') $module = (int)$data->modules[$i]; if($data->projects[$i] != 'ditto') $project = (int)$data->projects[$i]; @@ -219,9 +218,9 @@ class bugModel extends model if(isset($data->uploadImage)) $this->loadModel('file'); $bugs = array(); - for($i = 0; $i < $batchNum; $i++) + foreach($data->title as $i => $title) { - if(empty($data->title[$i])) continue; + if(empty($title)) continue; $bug = new stdClass(); $bug->openedBy = $this->app->user->account; diff --git a/module/story/model.php b/module/story/model.php index ac96fb8eee..d6eb84f980 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -254,7 +254,6 @@ class storyModel extends model $now = helper::now(); $mails = array(); $stories = fixer::input('post')->get(); - $batchNum = count(reset($stories)); $result = $this->loadModel('common')->removeDuplicate('story', $stories, "product={$productID}"); $stories = $result['data']; @@ -264,7 +263,7 @@ class storyModel extends model $pri = 0; $source = ''; - for($i = 0; $i < $batchNum; $i++) + foreach($stories->title as $i => $title) { $module = $stories->module[$i] == 'ditto' ? $module : $stories->module[$i]; $plan = $stories->plan[$i] == 'ditto' ? $plan : $stories->plan[$i]; @@ -280,9 +279,9 @@ class storyModel extends model $forceReview = $this->checkForceReview(); $data = array(); - for($i = 0; $i < $batchNum; $i++) + foreach($stories->title as $i => $title) { - if(empty($stories->title[$i])) continue; + if(empty($title)) continue; $story = new stdclass(); $story->branch = $stories->branch[$i]; $story->module = $stories->module[$i]; diff --git a/module/task/model.php b/module/task/model.php index 2ac6147934..5c6a6ee4b8 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -146,7 +146,6 @@ class taskModel extends model $now = helper::now(); $mails = array(); $tasks = fixer::input('post')->get(); - $batchNum = count(reset($tasks)); $storyIDs = array(); $taskNames = array(); @@ -187,7 +186,7 @@ class taskModel extends model /* Get task data. */ $data = array(); - for($i = 0; $i < $batchNum; $i++) + foreach($tasks->name as $i => $name) { $story = !isset($tasks->story[$i]) || $tasks->story[$i] == 'ditto' ? $story : $tasks->story[$i]; $module = !isset($tasks->module[$i]) || $tasks->module[$i] == 'ditto' ? $module : $tasks->module[$i]; diff --git a/module/testcase/model.php b/module/testcase/model.php index 7490e3578e..d3f9a51924 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -243,12 +243,11 @@ class testcaseModel extends model $branch = (int)$branch; $now = helper::now(); $cases = fixer::input('post')->get(); - $batchNum = count(reset($cases)); $result = $this->loadModel('common')->removeDuplicate('case', $cases, "product={$productID}"); $cases = $result['data']; - for($i = 0; $i < $batchNum; $i++) + foreach($cases->title as $i => $title) { if(!empty($cases->title[$i]) and empty($cases->type[$i])) die(js::alert(sprintf($this->lang->error->notempty, $this->lang->testcase->type))); } @@ -257,12 +256,12 @@ class testcaseModel extends model $story = 0; $type = ''; $pri = 3; - for($i = 0; $i < $batchNum; $i++) + foreach($cases->title as $i => $title) { $module = $cases->module[$i] == 'ditto' ? $module : $cases->module[$i]; $story = $cases->story[$i] == 'ditto' ? $story : $cases->story[$i]; $type = $cases->type[$i] == 'ditto' ? $type : $cases->type[$i]; - $pri = $cases->pri[$i] == 'ditto' ? $pri : $cases->pri[$i]; + $pri = $cases->pri[$i] == 'ditto' ? $pri : $cases->pri[$i]; $cases->module[$i] = (int)$module; $cases->story[$i] = (int)$story; $cases->type[$i] = $type; @@ -273,9 +272,9 @@ class testcaseModel extends model $storyVersions = array(); $forceNotReview = $this->forceNotReview(); $data = array(); - for($i = 0; $i < $batchNum; $i++) + foreach($cases->title as $i => $title) { - if(empty($cases->title[$i])) continue; + if(empty($title)) continue; $data[$i] = new stdclass(); $data[$i]->product = $productID; diff --git a/module/testcase/view/batchcreate.html.php b/module/testcase/view/batchcreate.html.php index 2bb2e63733..c932fcc709 100644 --- a/module/testcase/view/batchcreate.html.php +++ b/module/testcase/view/batchcreate.html.php @@ -133,8 +133,8 @@ - testcase->typeList, $type, "class=form-control chosen");?> - '> testcase->priList, $pri, "class=form-control chosen");?> + testcase->typeList, $type, "class='form-control chosen'");?> + '> testcase->priList, $pri, "class='form-control chosen'");?> '> '> ' style='overflow:visible'>testcase->stageList, '', "class='form-control chosen' multiple");?>