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

* finish task #4807.

Browse Source
This commit is contained in:
wangyidong
2018-09-05 12:08:52 +08:00
parent 2f5e741284
commit 4a49230495
5 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/model.php
+3 -4
View File
@@ -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;
module/story/model.php
+3 -4
View File
@@ -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];
module/task/model.php
+1 -2
View File
@@ -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];
module/testcase/model.php
+5 -6
View File
@@ -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;
module/testcase/view/batchcreate.html.php
+2 -2
View File
@@ -133,8 +133,8 @@
</div>
</div>
</td>
<td><?php echo html::select("type[%s]", $lang->testcase->typeList, $type, "class=form-control chosen");?></td>
<td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>'> <?php echo html::select("pri[%s]", $lang->testcase->priList, $pri, "class=form-control chosen");?></td>
<td><?php echo html::select("type[%s]", $lang->testcase->typeList, $type, "class='form-control chosen'");?></td>
<td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>'> <?php echo html::select("pri[%s]", $lang->testcase->priList, $pri, "class='form-control chosen'");?></td>
<td class='<?php echo zget($visibleFields, 'precondition', 'hidden')?>'><?php echo html::textarea("precondition[%s]", '', "rows='1' class='form-control'")?></td>
<td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'> <?php echo html::input("keywords[%s]", '', "class='form-control' autocomplete='off'");?></td>
<td class='text-left<?php echo zget($visibleFields, 'stage', ' hidden')?>' style='overflow:visible'><?php echo html::select("stage[%s][]", $lang->testcase->stageList, '', "class='form-control chosen' multiple");?></td>